diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index d3af46b5e..d8980a247 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -1284,14 +1284,9 @@
                 and bl_sign!='1' and waybill_status!='40'
             </if>
 
-            <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  or (params.isNeedBatch != null and params.isNeedBatch != 1) ) and salesmen == null and custNo == null " >
-                <if test=" params.privSiteCode != null and params.privSiteCode != '88888'">
+            <if test="(params.isNeedBatch == null  or (params.isNeedBatch != null and params.isNeedBatch != 1) ) " >
+                <if test="(salesmen == null or salesmen=='') and params.privSiteCode != null and params.privSiteCode != '88888'">
                     and (
 
                         a.send_site_code in (
@@ -1314,6 +1309,11 @@
                         <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>
+                        <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}