From 5cb9cdfc5bc957eb4bcce35e11e50287cd865400 Mon Sep 17 00:00:00 2001
From: zhaoqiaobo <zhaoqiaobo@163.com>
Date: Thu, 6 Jun 2024 15:16:51 +0800
Subject: [PATCH] =?UTF-8?q?feat(all):=20=E4=BF=AE=E6=94=B9=E6=9E=97?=
 =?UTF-8?q?=E6=B0=8F=E5=8F=96=E6=B6=88=E5=90=8E=E9=87=8D=E6=96=B0=E6=8E=A8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=97=A0=E6=B3=95=E5=85=A5=E6=9A=82=E5=AD=98?=
 =?UTF-8?q?=E5=8D=95=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml | 2 +-
 .../service/impl/TrunklineAdvanceDetailServiceImpl.java         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml
index 91f004809..47a2426a3 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineAdvanceDetailMapper.xml
+++ b/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">
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java
index 1564d9ab8..a15d4c36d 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceDetailServiceImpl.java
+++ b/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;
     }