From 33c6bc829f7f940e6d0b433f2fe6e5cb13e2f052 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 9 Mar 2025 00:06:19 +0800
Subject: [PATCH] md

---
 emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 1dd955482..9e9886b01 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -685,6 +685,7 @@
                 and a.bl_sign=#{blSign}
             </if>
 
+
             <if test="params.beginDate != null and params.beginDate != ''">
                 and a.send_date <![CDATA[ >= ]]>  #{params.beginDate}
             </if>
@@ -718,7 +719,9 @@
                         SELECT #{params.privSiteCode} FROM dual
                     )
                     and (
-                        a.take_piece_employee_code=#{params.privEmpCode} or (a.take_piece_employee_code is null)
+                        a.take_piece_employee_code=#{params.privEmpCode}
+                        or (a.pickup_method in('1','3') and a.operate_employee_code is null  )
+                        or (a.operate_employee_code=#{params.privEmpCode} )
                     )
                 )