From c3dfa328febf404dfbd77b2f2a4d90167988e8fa Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 5 Jun 2024 18:02:29 +0800
Subject: [PATCH] md

---
 .../mapper/EmisTmsScanRecordMapper.xml        | 27 ++++++------------
 .../resources/mapper/EmisWaybillMapper.xml    | 28 +++++++------------
 2 files changed, 18 insertions(+), 37 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
index 0bfe6703b..28d4e3a91 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
@@ -262,25 +262,14 @@
             </if>
 
 
-            <if test="params.isPrivQuery != null and params.isPrivQuery == 'T'">
-                and (
-
-                scan_site_code in (
-                        SELECT
-                        site_code
-                        FROM (
-                        SELECT
-                        t1.site_code,
-                        t1.parent_site_code,
-                        IF( FIND_IN_SET( parent_site_code, @pids ) > 0, @pids := concat( @pids, ',', site_code ), 0 ) AS child_path
-                        FROM
-                        ( SELECT site_code, parent_site_code FROM emis_site t WHERE del_flag = '0' ORDER BY site_code, parent_site_code ) t1,
-                        ( SELECT @pids := #{params.privSiteCode} ) t2
-                        ) t3
-                        WHERE child_path > 0
-                        UNION
-                        SELECT #{params.privSiteCode} FROM DUAL
-                        )
+            <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
+                and scan_site_code in (
+                    SELECT t1.site_code FROM (
+                    SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
+                    #{params.privSiteCode} ) pd
+                    WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
+                    UNION
+                    SELECT #{params.privSiteCode} FROM dual
                 )
             </if>
 
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index e998d046d..f3207aa2b 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -402,7 +402,7 @@
             <if test="registerDate != null "> and register_date = #{registerDate}</if>
             <if test="registerManCode != null  and registerManCode != ''"> and register_man_code like concat('%', #{registerManCode}, '%')</if>
             <if test="takePieceEmployeeCode != null  and takePieceEmployeeCode != ''"> and take_piece_employee_code like concat('%', #{takePieceEmployeeCode}, '%')</if>
-            <if test="sendSiteCode != null  and sendSiteCode != ''"> and send_site_code like concat('%', #{sendSiteCode}, '%')</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 like concat('%', #{dispatchManCode}, '%')</if>
             <if test="dispatchDate != null  and dispatchDate != ''"> and dispatch_date like concat('%', #{dispatchDate}, '%')</if>
@@ -471,24 +471,16 @@
             </if>
 
 
-            <if test="params.privSiteCode != null">
+            <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
                 and (
-                    send_site_code in (
-                            SELECT
-                            site_code
-                            FROM (
-                            SELECT
-                            t1.site_code,
-                            t1.parent_site_code,
-                            IF( FIND_IN_SET( parent_site_code, @pids ) > 0, @pids := concat( @pids, ',', site_code ), 0 ) AS child_path
-                            FROM
-                            ( SELECT site_code, parent_site_code FROM emis_site t WHERE del_flag = '0' ORDER BY site_code, parent_site_code ) t1,
-                            ( SELECT @pids := #{params.privSiteCode} ) t2
-                            ) t3
-                            WHERE child_path > 0
-                            UNION
-                            SELECT #{params.privSiteCode} FROM DUAL
-                    )
+                     send_site_code in (
+                        SELECT t1.site_code FROM (
+                        SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
+                        #{params.privSiteCode} ) pd
+                        WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
+                        UNION
+                        SELECT #{params.privSiteCode} FROM dual
+                     )
 
                     or salesmen=#{params.privEmpCode}
                     or payee=#{params.privEmpName}