diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index f7587be7a..de61d6a5c 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -548,6 +548,7 @@ + and ( a.send_site_code in ( diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml index b8ddcc6d0..325943a4a 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillProblemInfoMapper.xml @@ -83,6 +83,28 @@ and register_date #{params.endRegisterDate} + + and ( + register_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 + 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 + ) + ) + + order by create_time desc