diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 0a71127dc..9a56a7fc2 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -622,7 +622,6 @@
             <if test="destinationCenterCode != null  and destinationCenterCode != ''"> and destination_center_code=#{destinationCenterCode}</if>
             <if test="marketManCode != null  and marketManCode != ''"> and market_man_code = #{marketManCode}</if>
 
-
             <if test="operateEmployeeCode != null  and operateEmployeeCode != ''"> and operate_employee_code=#{operateEmployeeCode}</if>
             <if test="blIsQuestion != null  and blIsQuestion != ''"> and bl_is_question=#{blIsQuestion}</if>
             <if test="problemType != null  and problemType != ''"> and problem_type=#{problemType}</if>
@@ -639,14 +638,12 @@
             <if test="paymentRemark != null  and paymentRemark != ''"> and payment_remark like concat('%', #{paymentRemark}, '%')</if>
             <if test="orderRemark != null  and orderRemark != ''"> and order_remark like concat('%', #{orderRemark}, '%')</if>
 
-
             <if test="remark != null  and remark != ''"> and a.remark like concat('%', #{remark}, '%')</if>
             <if test="createBy != null  and createBy != ''"> and a.create_by= #{createBy}</if>
             <if test="updateBy != null  and updateBy != ''"> and a.update_by=#{updateBy}</if>
             <if test="createSite != null  and createSite != ''"> and a.create_site=#{createSite}</if>
             <if test="updateSite != null  and updateSite != ''"> and a.update_site=#{updateSite}</if>
 
-
             <if test="params.waybillStatType != null and params.waybillStatType == 1">
                 and a.waybill_status='0' and a.order_status='0'
             </if>
@@ -663,7 +660,6 @@
 
             </if>
 
-
             <if test="params.beginOrderDate != null and params.beginOrderDate != ''">
                 and a.order_date <![CDATA[ >= ]]>  #{params.beginOrderDate}
             </if>
@@ -679,12 +675,10 @@
                 or a.salesmen=#{salesmen}
              </if>
 
-
             <if test="sendSiteCode != null  and sendSiteCode != ''">
                 and a.send_site_code=#{sendSiteCode}
              </if>
 
-
             <if test="blSign != null  and blSign == 1">
                 and a.bl_sign='1'
             </if>
@@ -741,10 +735,8 @@
                 and bl_sign!='1' and waybill_status!='40'
             </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 (
                 SELECT t1.site_code FROM (
                 SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
@@ -772,10 +764,14 @@
                 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})
-                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}
+
+                <!--
+                    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}
+                 -->
+
                 )
             </if>
 
@@ -1475,7 +1471,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 (