diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index d5e54eda8..b8dba5266 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -710,14 +710,7 @@
 
             <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
                 and (
-                    a.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
-                    )
+                    a.send_site_code=#{params.privSiteCode}
                     and (
                         a.take_piece_employee_code=#{params.privEmpCode}
                         or (a.pickup_method in('1','3') and a.operate_employee_code is null  )
@@ -1003,22 +996,7 @@
 
             <if test="salesmen == null and params.privSiteCode != null and params.privSiteCode != '88888'">
                 and (
-                    a.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 a.salesmen=#{params.privEmpName}
-                    or a.payee=#{params.privEmpName}
-                    or a.operate_employee_code=#{params.privEmpCode}
-                    or a.take_piece_employee_code=#{params.privEmpCode}
-                 -->
-
+                    a.send_site_code=#{params.privSiteCode}
                 )
             </if>
 
@@ -1340,23 +1318,8 @@
                 <if test="(salesmen == null or salesmen=='') and params.privSiteCode != null and params.privSiteCode != '88888'">
                     and (
 
-                        a.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
-                        a.dispatch_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
-                        )
+                        a.send_site_code=#{params.privSiteCode}
+                        or a.dispatch_site_code=#{params.privSiteCode}
                         <if test="params.isQueryPrintOrder != null and params.isQueryPrintOrder == 1">
                                 or EXISTS (select 1 from emis_tms_scan_record  etsr where a.bill_code=etsr.main_bill_code and etsr.scan_site_code=#{params.privSiteCode})
                         </if>
@@ -1416,23 +1379,9 @@
              <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
                 and (
 
-                a.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
-                )
+                a.send_site_code=#{params.privSiteCode}
                 or
-                a.dispatch_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
-                )
+                a.dispatch_site_code=#{params.privSiteCode}
                 <if test="params.isQueryPrintOrder != null and params.isQueryPrintOrder == 1">
                     or EXISTS (select 1 from emis_tms_scan_record  etsr where a.bill_code=etsr.main_bill_code and etsr.scan_site_code=#{params.privSiteCode})
                 </if>
@@ -1493,23 +1442,9 @@
 
             <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
                 and (
-                    a.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
-                    )
+                    a.send_site_code=#{params.privSiteCode}
                     or
-                    a.dispatch_underling_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
-                    )
+                    a.dispatch_underling_site_code=#{params.privSiteCode}
                 )
             </if>
 
@@ -1557,23 +1492,8 @@
             </if>
             <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
                 and (
-                a.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
-                a.dispatch_underling_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
-                )
+                    a.send_site_code=#{params.privSiteCode}
+                    or a.dispatch_underling_site_code=#{params.privSiteCode}
                 )
             </if>
 
@@ -1885,23 +1805,9 @@
             <if test="salesmen == null and params.privSiteCode != null and params.privSiteCode != '88888'">
                 and (
 
-                a.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
-                )
+                a.send_site_code=#{params.privSiteCode}
                 or
-                a.dispatch_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
-                )
+                a.dispatch_site_code=#{params.privSiteCode}
                 <if test="params.isQueryPrintOrder != null and params.isQueryPrintOrder == 1">
                     or EXISTS (select 1 from emis_tms_scan_record  etsr where a.bill_code=etsr.main_bill_code and etsr.scan_site_code=#{params.privSiteCode})
                 </if>
@@ -2080,32 +1986,11 @@
 
             <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
                 and (
-                    a.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
-                    )
+                    a.send_site_code=#{params.privSiteCode}
                     or
-                    a.dispatch_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
-                    )
+                    a.dispatch_site_code=#{params.privSiteCode}
                     or
-                    a.sign_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
-                    )
+                    a.sign_site_code=#{params.privSiteCode}
                     or EXISTS (select 1 from emis_tms_scan_record  etsr where a.bill_code=etsr.main_bill_code and etsr.scan_site_code=#{params.privSiteCode})
                     or a.salesmen=#{params.privEmpName}
                     or a.salesmen in(
@@ -2159,14 +2044,7 @@
             and a.order_status in('0','3')
             <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
                 and (
-                    a.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
-                    )
+                    a.send_site_code=#{params.privSiteCode}
                     and (
                         a.take_piece_employee_code=#{params.privEmpCode}
                         or (a.pickup_method in('1','3') and a.operate_employee_code is null  )
@@ -2188,14 +2066,7 @@
             and a.waybill_status!='0'
             and a.order_status!='2'
             <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
-                and a.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
-                )
+                and a.send_site_code=#{params.privSiteCode}
                 and (
                     a.operate_employee_code=#{params.privEmpCode}
                     or a.take_piece_employee_code=#{params.privEmpCode}
@@ -2215,14 +2086,7 @@
         where a.del_flag='0'
         and a.order_status='2'
         <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
-            and a.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
-            )
+            and a.send_site_code=#{params.privSiteCode}
             and (
                 a.operate_employee_code=#{params.privEmpCode}
                 or a.take_piece_employee_code=#{params.privEmpCode}
@@ -2242,15 +2106,7 @@
         where a.del_flag='0'
         and a.order_status in('0','3')
         <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
-            and a.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
-            )
-
+            and a.send_site_code=#{params.privSiteCode}
             and exists (
                 select 1 from  emis_waybill_change_to ewcto where a.bill_code=ewcto.bill_code and ewcto.change_from=#{params.privEmpCode}
             )
@@ -2268,14 +2124,7 @@
         where a.del_flag='0'
         and a.waybill_status='40'
         <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
-            and a.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
-            )
+            and a.send_site_code=#{params.privSiteCode}
             and (
             a.operate_employee_code=#{params.privEmpCode}
             or a.take_piece_employee_code=#{params.privEmpCode}
@@ -2295,14 +2144,7 @@
         where a.del_flag='0'
         and a.bl_sign='1'
         <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
-            and a.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
-            )
+            and a.send_site_code=#{params.privSiteCode}
             and (
             a.operate_employee_code=#{params.privEmpCode}
             or a.take_piece_employee_code=#{params.privEmpCode}