From 74c5ec62f32020cb89e88aeb4d4a3a56c2ee4e5a Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 16 Nov 2024 11:10:14 +0800
Subject: [PATCH] md

---
 .../main/resources/mapper/EmisWaybillMapper.xml    | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 52fbcde5c..249fab2f5 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -1284,7 +1284,13 @@
                 and bl_sign!='1' and waybill_status!='40'
             </if>
 
-            <if test="params.isNeedBatch == null and salesmen == null" >
+            <if test="custNo != null and custNo != ''">
+                and EXISTS (
+                select 1 from emis_customer_user ecu where a.cust_no=ecu.monthly_pay_code and ecu.owner_site=#{params.privSiteCode}
+                )
+            </if>
+
+            <if test="params.isNeedBatch == null and salesmen == null and custNo == null " >
                 <if test=" params.privSiteCode != null and params.privSiteCode != '88888'">
                     and (
 
@@ -1309,11 +1315,7 @@
                                 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>
 
-                        <if test="custNo != null and custNo != ''">
-                            or EXISTS (
-                                select 1 from emis_customer_user ecu where a.cust_no=ecu.monthly_pay_code and ecu.owner_site=#{params.privSiteCode}
-                            )
-                        </if>
+
 
                         or a.salesmen=#{params.privEmpName}
                         or a.payee=#{params.privEmpName}