diff --git a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
index 5c1ad494c..d89d0b530 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
@@ -284,7 +284,7 @@
               and ( FIND_IN_SET(`order_sn`,#{orderSn}) or order_sn like concat('%', #{orderSn}, '%') )
             </if>
 
-            <if test="billCode != null  and billCode != '' and params.billCodeSortList == null">
+            <if test="billCode != null  and billCode != '' and ( params.billCodeSortList == null or (params.billCodeSortList != null and params.billCodeSortList.size() == 1 ) )">
                 and `bill_code`=#{billCode}
             </if>
             <if test="params.billCodeSortList != null and params.billCodeSortList.size() > 1  ">
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml
index 9b89de642..8f5a6b7a8 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillAttachmentMapper.xml
@@ -32,7 +32,7 @@
               and  ( FIND_IN_SET(`bill_code`,#{billCode}) or bill_code like concat('%', #{billCode}, '%') )
                -->
 
-            <if test="billCode != null  and billCode != '' and params.billCodeSortList == null">
+            <if test="billCode != null  and billCode != '' and ( params.billCodeSortList == null or (params.billCodeSortList != null and params.billCodeSortList.size() == 1 ) )">
                 and `bill_code`=#{billCode}
             </if>
             <if test="params.billCodeSortList != null and params.billCodeSortList.size() > 1  ">
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 716817620..e6471f685 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -511,7 +511,7 @@
     <select id="selectEmisWaybillByMutiBillCode" parameterType="EmisWaybill" resultMap="EmisWaybillResult">
         <include refid="selectEmisWaybillVo"/>
         where a.del_flag='0'
-        <if test="billCode != null  and billCode != '' and params.billCodeSortList == null">
+        <if test="billCode != null  and billCode != '' and ( params.billCodeSortList == null or (params.billCodeSortList != null and params.billCodeSortList.size() == 1 ) )">
             and a.`bill_code`=#{billCode}
         </if>
         <if test="params.billCodeSortList != null and params.billCodeSortList.size() > 1  ">
@@ -549,8 +549,8 @@
              and ( FIND_IN_SET(`order_sn`,#{orderSn}) or order_sn like concat('%', #{orderSn}, '%') )
              </if>
 
-            <if test="billCode != null  and billCode != '' and params.billCodeSortList == null">
-                and ( a.`bill_code`=#{billCode} or a.bill_code like concat(#{billCode}, '%') )
+            <if test="billCode != null  and billCode != '' and ( params.billCodeSortList == null or (params.billCodeSortList != null and params.billCodeSortList.size() == 1 ) )">
+                and ( a.`bill_code`=#{billCode} or a.bill_code like concat('%',#{billCode}) )
             </if>
             <if test="params.billCodeSortList != null and params.billCodeSortList.size() > 1  ">
                 and a.bill_code in
@@ -795,8 +795,8 @@
             <if test="id != null "> and a.id = #{id}</if>
             <if test="orderSn != null  and orderSn != ''"> and ( FIND_IN_SET(a.`order_sn`,#{orderSn}) or a.order_sn like concat('%', #{orderSn}, '%') ) </if>
 
-            <if test="billCode != null  and billCode != '' and params.billCodeSortList == null">
-                and ( a.`bill_code`=#{billCode} or a.bill_code like concat(#{billCode}, '%') )
+            <if test="billCode != null  and billCode != '' and ( params.billCodeSortList == null or (params.billCodeSortList != null and params.billCodeSortList.size() == 1 ) )">
+                and ( a.`bill_code`=#{billCode} or a.bill_code like concat('%',#{billCode}) )
             </if>
             <if test="params.billCodeSortList != null and params.billCodeSortList.size() > 1  ">
                 and a.bill_code in
@@ -1086,8 +1086,8 @@
 
             <if test="orderSn != null  and orderSn != ''"> and ( FIND_IN_SET(`order_sn`,#{orderSn}) or order_sn like concat('%', #{orderSn}, '%') ) </if>
 
-            <if test="billCode != null  and billCode != '' and params.billCodeSortList == null">
-                and ( a.`bill_code`=#{billCode} or a.bill_code like concat(#{billCode}, '%') )
+            <if test="billCode != null  and billCode != '' and ( params.billCodeSortList == null or (params.billCodeSortList != null and params.billCodeSortList.size() == 1 ) )">
+                and ( a.`bill_code`=#{billCode} or a.bill_code like concat('%',#{billCode}) )
             </if>
             <if test="params.billCodeSortList != null and params.billCodeSortList.size() > 1  ">
                 and a.bill_code in
@@ -1590,8 +1590,8 @@
 
             <if test="orderSn != null  and orderSn != ''"> and ( FIND_IN_SET(`order_sn`,#{orderSn}) or order_sn like concat('%', #{orderSn}, '%') ) </if>
 
-            <if test="billCode != null  and billCode != '' and params.billCodeSortList == null">
-                and ( a.`bill_code`=#{billCode} or a.bill_code like concat(#{billCode}, '%') )
+            <if test="billCode != null  and billCode != '' and ( params.billCodeSortList == null or (params.billCodeSortList != null and params.billCodeSortList.size() == 1 ) )">
+                and ( a.`bill_code`=#{billCode} or a.bill_code like concat('%',#{billCode}) )
             </if>
             <if test="params.billCodeSortList != null and params.billCodeSortList.size() > 1  ">
                 and a.bill_code in
@@ -2044,8 +2044,8 @@
         <where>
             a.del_flag='0' and a.order_status !='0' and a.order_status!='2'
 
-            <if test="billCode != null  and billCode != '' and params.billCodeSortList == null">
-                and ( a.`bill_code`=#{billCode} or a.bill_code like concat(#{billCode}, '%') )
+            <if test="billCode != null  and billCode != '' and ( params.billCodeSortList == null or (params.billCodeSortList != null and params.billCodeSortList.size() == 1 ) )">
+                and ( a.`bill_code`=#{billCode} or a.bill_code like concat('%',#{billCode}) )
             </if>
             <if test="params.billCodeSortList != null and params.billCodeSortList.size() > 1  ">
                 and a.bill_code in