Merge branch 'dev' into pre-production

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml

@@ -201,7 +201,7 @@
     </select>
     <select id="findPackageCodeByCodes" resultType="java.util.Map">
         select t.order_package_code code,t.id id from logpm_trunkline_advance_detail t
-        where exists(
+        where t.is_deleted= 0 and exists(
         select 1 from (
         <foreach collection="orderPackageCodes" index="ind" item="item">
             <if test="ind == 0">

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java

@@ -275,7 +275,7 @@ public class TrunklineAdvanceDetailServiceImpl extends BaseServiceImpl<Trunkline
     public Map<String, String> findPackageCodeByCodes(Set<String> orderPackageCodes) {
 		List<Map<String, String>> packageCodeByCodes = baseMapper.findPackageCodeByCodes(orderPackageCodes);
 		if(CollUtil.isNotEmpty(packageCodeByCodes)){
-			return packageCodeByCodes.stream().collect(Collectors.toMap(map -> map.get("code"), map -> map.get("id")));
+			return packageCodeByCodes.stream().collect(Collectors.toMap(map -> map.get("code"), map -> String.valueOf(map.get("id"))));
 		}
 		return null;
     }