From 58141603bbe2af5c5ad2ce9c451f4490a2b75868 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 31 Mar 2025 11:09:16 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisWaybillAttachmentController.java     | 4 ++++
 .../src/main/resources/mapper/EmisTmsScanRecordMapper.xml | 2 +-
 .../main/resources/mapper/EmisWaybillAttachmentMapper.xml | 8 +++++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAttachmentController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAttachmentController.java
index 52ecd6804..da077b6c8 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAttachmentController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisWaybillAttachmentController.java
@@ -99,6 +99,10 @@ public class EmisWaybillAttachmentController extends EmisBaseController
         if(!StringUtils.isEmpty(billCode)){
             EmisWaybillAttachment emisWaybillAttachment = new EmisWaybillAttachment();
             emisWaybillAttachment.setBillCode(billCode);
+            String[] billCodeSortList = emisWaybillAttachment.getBillCode().split(",");
+            if(billCodeSortList.length>1){
+                emisWaybillAttachment.getParams().put("billCodeSortList",Arrays.asList(billCodeSortList));
+            }
             list = emisWaybillAttachmentService.selectEmisWaybillAttachmentList(emisWaybillAttachment);
         }else{
             list = new ArrayList<>();
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
index d03629c53..db9c468df 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
@@ -285,7 +285,7 @@
             </if>
             <if test="billCode != null  and billCode != ''">
              <!-- and ( FIND_IN_SET(`bill_code`,#{billCode}) or FIND_IN_SET(`main_bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') )  -->
-             and bill_code in
+                and bill_code in
                  <foreach collection="params.billCodeSortList" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml
index 20fb46ccb..36a4eb0c2 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml
@@ -28,7 +28,13 @@
             del_flag='0'
             <if test="id != null "> and id = #{id}</if>
             <if test="waybillId != null "> and waybill_id = #{waybillId}</if>
-            <if test="billCode != null  and billCode != ''"> and `bill_code` ( FIND_IN_SET(`bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') )  </if>
+            <if test="billCode != null  and billCode != ''">
+                and bill_code in
+                <foreach collection="params.billCodeSortList" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+             <!-- and `bill_code` ( FIND_IN_SET(`bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') ) -->
+            </if>
             <if test="attachType != null  and attachType != ''"> and FIND_IN_SET(attach_type,#{attachType})</if>
             <if test="fileName != null  and fileName != ''"> and file_name like concat('%', #{fileName}, '%')</if>
             <if test="fileUrl != null  and fileUrl != ''"> and file_url like concat('%', #{fileUrl}, '%')</if>