From f4b9e3a7f887a0db0b58ecb38358be0b65364f73 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 9 Aug 2024 14:23:04 +0800
Subject: [PATCH] md

---
 .../src/main/resources/mapper/EmisWaybillMapper.xml    | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 842a05c9c..c8338f798 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -1073,7 +1073,7 @@
             </if>
 
 
-            <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
+            <if test="salesmen == null and params.privSiteCode != null and params.privSiteCode != '88888'">
                 and (
 
                     a.send_site_code in (
@@ -1093,7 +1093,9 @@
                         UNION
                         SELECT #{params.privSiteCode} FROM dual
                     )
-                    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 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>
                     or a.salesmen=#{params.privEmpName}
                     or a.payee=#{params.privEmpName}
                     or a.operate_employee_code=#{params.privEmpCode}
@@ -1532,7 +1534,9 @@
                 UNION
                 SELECT #{params.privSiteCode} FROM dual
                 )
-                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 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>
                 or a.salesmen=#{params.privEmpName}
                 or a.payee=#{params.privEmpName}
                 or a.operate_employee_code=#{params.privEmpCode}