diff --git a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
index 0bfe6703b..28d4e3a91 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
@@ -262,25 +262,14 @@
-
- and (
-
- scan_site_code in (
- SELECT
- site_code
- FROM (
- SELECT
- t1.site_code,
- t1.parent_site_code,
- IF( FIND_IN_SET( parent_site_code, @pids ) > 0, @pids := concat( @pids, ',', site_code ), 0 ) AS child_path
- FROM
- ( SELECT site_code, parent_site_code FROM emis_site t WHERE del_flag = '0' ORDER BY site_code, parent_site_code ) t1,
- ( SELECT @pids := #{params.privSiteCode} ) t2
- ) t3
- WHERE child_path > 0
- UNION
- SELECT #{params.privSiteCode} FROM DUAL
- )
+
+ and scan_site_code in (
+ SELECT t1.site_code FROM (
+ SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
+ #{params.privSiteCode} ) pd
+ WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
+ UNION
+ SELECT #{params.privSiteCode} FROM dual
)
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index e998d046d..f3207aa2b 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -402,7 +402,7 @@
and register_date = #{registerDate}
and register_man_code like concat('%', #{registerManCode}, '%')
and take_piece_employee_code like concat('%', #{takePieceEmployeeCode}, '%')
- and send_site_code like concat('%', #{sendSiteCode}, '%')
+ and send_site_code=#{sendSiteCode}
and send_date = #{sendDate}
and dispatch_man_code like concat('%', #{dispatchManCode}, '%')
and dispatch_date like concat('%', #{dispatchDate}, '%')
@@ -471,24 +471,16 @@
-
+
and (
- send_site_code in (
- SELECT
- site_code
- FROM (
- SELECT
- t1.site_code,
- t1.parent_site_code,
- IF( FIND_IN_SET( parent_site_code, @pids ) > 0, @pids := concat( @pids, ',', site_code ), 0 ) AS child_path
- FROM
- ( SELECT site_code, parent_site_code FROM emis_site t WHERE del_flag = '0' ORDER BY site_code, parent_site_code ) t1,
- ( SELECT @pids := #{params.privSiteCode} ) t2
- ) t3
- WHERE child_path > 0
- UNION
- SELECT #{params.privSiteCode} FROM DUAL
- )
+ send_site_code in (
+ SELECT t1.site_code FROM (
+ SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
+ #{params.privSiteCode} ) pd
+ WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
+ UNION
+ SELECT #{params.privSiteCode} FROM dual
+ )
or salesmen=#{params.privEmpCode}
or payee=#{params.privEmpName}