From 6ed897b971ceaa44bbe427e42b78a5006d38b59f Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 28 Jul 2024 19:58:18 +0800
Subject: [PATCH] md'

---
 .../resources/mapper/EmisWaybillMapper.xml    | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index d2e3fc22a..bc5102911 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -608,7 +608,6 @@
             <if test="registerDate != null "> and register_date = #{registerDate}</if>
             <if test="registerManCode != null  and registerManCode != ''"> and register_man_code= #{registerManCode}</if>
             <if test="takePieceEmployeeCode != null  and takePieceEmployeeCode != ''"> and take_piece_employee_code=#{takePieceEmployeeCode}</if>
-            <if test="sendSiteCode != null  and sendSiteCode != ''"> and send_site_code=#{sendSiteCode}</if>
             <if test="sendDate != null "> and send_date = #{sendDate}</if>
             <if test="dispatchManCode != null  and dispatchManCode != ''"> and dispatch_man_code=#{dispatchManCode}</if>
             <if test="dispatchSiteCode != null  and dispatchSiteCode != ''"> and dispatch_site_code=#{dispatchSiteCode}</if>
@@ -622,8 +621,8 @@
             <if test="dispatchUnderlingSiteCode != null  and dispatchUnderlingSiteCode != ''"> and dispatch_underling_site_code=#{dispatchUnderlingSiteCode}</if>
             <if test="destinationCenterCode != null  and destinationCenterCode != ''"> and destination_center_code=#{destinationCenterCode}</if>
             <if test="marketManCode != null  and marketManCode != ''"> and market_man_code = #{marketManCode}</if>
-            <if test="payee != null  and payee != ''"> and payee=#{payee}</if>
-            <if test="salesmen != null  and salesmen != ''"> and salesmen like concat('%', #{salesmen}, '%')</if>
+
+
             <if test="operateEmployeeCode != null  and operateEmployeeCode != ''"> and operate_employee_code=#{operateEmployeeCode}</if>
             <if test="blIsQuestion != null  and blIsQuestion != ''"> and bl_is_question=#{blIsQuestion}</if>
             <if test="problemType != null  and problemType != ''"> and problem_type=#{problemType}</if>
@@ -640,7 +639,6 @@
             <if test="paymentRemark != null  and paymentRemark != ''"> and payment_remark like concat('%', #{paymentRemark}, '%')</if>
             <if test="orderRemark != null  and orderRemark != ''"> and order_remark like concat('%', #{orderRemark}, '%')</if>
 
-            <if test="sendSiteCode != null  and sendSiteCode != ''"> and a.send_site_code= #{sendSiteCode}</if>
 
             <if test="remark != null  and remark != ''"> and a.remark like concat('%', #{remark}, '%')</if>
             <if test="createBy != null  and createBy != ''"> and a.create_by= #{createBy}</if>
@@ -665,6 +663,19 @@
 
             </if>
 
+            <if test="payee != null  and payee != ''">
+                or a.payee=#{payee}
+             </if>
+
+            <if test="salesmen != null  and salesmen != '' " >
+                or a.salesmen=#{salesmen}
+             </if>
+
+
+            <if test="sendSiteCode != null  and sendSiteCode != ''">
+                and a.send_site_code=#{sendSiteCode}
+             </if>
+
 
             <if test="blSign != null  and blSign == 1">
                 and a.bl_sign='1'