From 1538ea228d8e76a467324048378f8186b215c9ac Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 21 Jul 2024 10:41:25 +0800
Subject: [PATCH] md

---
 .../mapper/EmisTmsScanRecordMapper.xml        | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
index 4982e7594..8c85f2aa4 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
@@ -115,25 +115,27 @@
                     <if test="params.sendDay != null and params.sendDay != ''">
                         and DATE(b.send_date)=#{params.sendDay}
                     </if>
-                    <if test="sendSiteCode != null  and sendSiteCode != ''">
-                        and b.send_site_code= #{sendSiteCode}
+                    <if test="params.sendSiteCode != null  and params.sendSiteCode != ''">
+                        and b.send_site_code= #{params.sendSiteCode}
                      </if>
+                    <if test="params.sendCenterCode != null  and params.sendCenterCode != ''">
+                        and b.send_center_code= #{params.sendCenterCode}
+                    </if>
+                    <if test="params.dispatchUnderlingSiteCode != null  and params.dispatchUnderlingSiteCode != ''">
+                        and b.dispatch_underling_site_code= #{params.dispatchUnderlingSiteCode}
+                    </if>
+                    <if test="params.destinationCenterCode != null  and params.destinationCenterCode != ''">
+                        and b.destination_center_code= #{params.destinationCenterCode}
+                    </if>
                     <if test="params.beginSendDate != null">
                         and b.send_date <![CDATA[ >= ]]>  #{params.beginSendDate}
                     </if>
                     <if test="params.endSendDate != null ">
                         and b.send_date <![CDATA[ <= ]]>  #{params.endSendDate}
                     </if>
-                    <if test="sendSiteCode != null  and sendSiteCode != ''"> and b.send_site_code= #{sendSiteCode}</if>
-                    <if test="sendCenterCode != null  and sendCenterCode != ''"> and b.send_center_code= #{sendCenterCode}</if>
-                    <if test="dispatchUnderlingSiteCode != null  and dispatchUnderlingSiteCode != ''">
-                        and b.dispatch_underling_site_code= #{dispatchUnderlingSiteCode}
-                    </if>
-                    <if test="destinationCenterCode != null  and destinationCenterCode != ''">
-                        and b.destination_center_code= #{destinationCenterCode}
-                    </if>
 
-        <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
+
+                    <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
                         and (
                             a.dispatch_underling_site_code in (
                             SELECT t1.site_code FROM (