diff --git a/emis-biz/src/main/resources/mapper/EmisQuoteDispAreaMapper.xml b/emis-biz/src/main/resources/mapper/EmisQuoteDispAreaMapper.xml index 13872e0e6..60f426450 100644 --- a/emis-biz/src/main/resources/mapper/EmisQuoteDispAreaMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisQuoteDispAreaMapper.xml @@ -58,8 +58,19 @@ and create_time = #{createTime} and update_by like concat('%', #{updateBy}, '%') and update_time = #{updateTime} - and create_site like concat('%', #{createSite}, '%') - and update_site like concat('%', #{updateSite}, '%') + + + + + + AND use_site_code in ( + SELECT t1.site_code FROM ( + SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid := + #{createSite} ) pd + WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code) + ) + + order by create_time desc diff --git a/emis-biz/src/main/resources/mapper/EmisQuoteSendAreaMapper.xml b/emis-biz/src/main/resources/mapper/EmisQuoteSendAreaMapper.xml index 0fbc3bda5..8cfd8491d 100644 --- a/emis-biz/src/main/resources/mapper/EmisQuoteSendAreaMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisQuoteSendAreaMapper.xml @@ -59,8 +59,20 @@ and create_time = #{createTime} and update_by like concat('%', #{updateBy}, '%') and update_time = #{updateTime} - and create_site like concat('%', #{createSite}, '%') - and update_site like concat('%', #{updateSite}, '%') + + + + + + AND use_site_code in ( + SELECT t1.site_code FROM ( + SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid := + #{createSite} ) pd + WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code) + ) + + + order by create_time desc