From 03fbe14f19e35811b6598cafb7a2b2e0542a6a83 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 3 Sep 2024 16:48:28 +0800
Subject: [PATCH] md

---
 .../src/main/resources/mapper/EmisWaybillMapper.xml   | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index e746fcf..888a245 100644
--- a/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-oms-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -500,10 +500,6 @@
                 and a.create_time <![CDATA[ <= ]]>  #{params.endCreateTime}
             </if>
 
-            <if test="params.expireNotSign != null and params.expireNotSign == 1">
-                and a.estimate_date <![CDATA[ < ]]>  now() and bl_sign!='1'
-            </if>
-
 
         </where>
 
@@ -561,11 +557,14 @@
         a.owner_site_code AS ownerSiteCode,
         b.site_name AS ownerSiteName
         FROM
-        sys_user a,emis_site b
-        WHERE a.del_flag='0' and b.del_flag='0' and a.bl_open='1' and a.owner_site_code=b.site_code
+        sys_user a,emis_site b,sys_user_post c
+        WHERE a.del_flag='0' and b.del_flag='0' and a.bl_open='1'
+             and a.owner_site_code=b.site_code and a.user_id=c.user_id and c.post_id=5
         <if test="searchValue != null and searchValue != ''">
             and (a.emp_code=#{searchValue} or a.phonenumber=#{searchValue})
         </if>
+
+
     </select>