diff --git a/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml b/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml index fe0a97ce8..daf56be0f 100644 --- a/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml @@ -49,8 +49,8 @@ and quote_id = #{quoteId} and quote_code like concat('%', #{quoteCode}, '%') and quote_name like concat('%', #{quoteName}, '%') - and ( FIND_IN_SET(#{fromCountry},from_country) or from_country='-1') - and ( FIND_IN_SET(#{country},country) or country='-1' ) + and ( FIND_IN_SET(#{fromCountry},from_country) or from_country='-1' or (from_country='-3' and not exists (select 1 from emis_country ec where FIND_IN_SET(ec.id, #{fromCountry}) and FIND_IN_SET('9', ec.continent_id)))) + and ( FIND_IN_SET(#{country},country) or country='-1' or (country='-3' and not exists (select 1 from emis_country ec where FIND_IN_SET(ec.id, #{country}) and FIND_IN_SET('9', ec.continent_id))) ) and ( ( FIND_IN_SET(#{sendSiteCode},send_site_code) and send_site_code is not null ) or send_site_code is null ) and ( ( FIND_IN_SET(#{nextSiteCode},next_site_code) and next_site_code is not null ) or next_site_code is null ) @@ -99,8 +99,8 @@ and quote_name like concat('%', #{quoteName}, '%') - and ( FIND_IN_SET(#{fromCountry},from_country) or from_country='-1' or from_country is null or from_country='' or ( #{fromCountry}!='0086' and from_country='-2' ) or from_country='-3') - and ( FIND_IN_SET(#{country},country) or country='-1' or country is null or country='' or ( #{country}!='0086' and country='-2' ) or country='-3' ) + and ( FIND_IN_SET(#{fromCountry},from_country) or from_country='-1' or from_country is null or from_country='' or ( #{fromCountry}!='0086' and from_country='-2' ) or (from_country='-3' and not exists (select 1 from emis_country ec where FIND_IN_SET(ec.code, #{fromCountry}) and FIND_IN_SET('9', ec.continent_id)))) + and ( FIND_IN_SET(#{country},country) or country='-1' or country is null or country='' or ( #{country}!='0086' and country='-2' ) or (country='-3' and not exists (select 1 from emis_country ec where FIND_IN_SET(ec.code, #{country}) and FIND_IN_SET('9', ec.continent_id))) ) and ( ( FIND_IN_SET(#{sendSiteCode},send_site_code) and send_site_code is not null ) or send_site_code is null ) and ( ( FIND_IN_SET(#{nextSiteCode},next_site_code) and next_site_code is not null ) or next_site_code is null ) @@ -333,4 +333,4 @@ order by create_time desc - \ No newline at end of file +