diff --git a/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml b/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml index 4259208fa..1e14e0269 100644 --- a/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml @@ -89,7 +89,7 @@ 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 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(#{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 ) diff --git a/emis-biz/src/main/resources/mapper/emis/EmisSalesCommissionRatioMapper.xml b/emis-biz/src/main/resources/mapper/EmisSalesCommissionRatioMapper.xml similarity index 100% rename from emis-biz/src/main/resources/mapper/emis/EmisSalesCommissionRatioMapper.xml rename to emis-biz/src/main/resources/mapper/EmisSalesCommissionRatioMapper.xml diff --git a/emis-biz/src/main/resources/mapper/emis/EmisTmsSiteBatchMissRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissRecordMapper.xml similarity index 100% rename from emis-biz/src/main/resources/mapper/emis/EmisTmsSiteBatchMissRecordMapper.xml rename to emis-biz/src/main/resources/mapper/EmisTmsSiteBatchMissRecordMapper.xml diff --git a/emis-biz/src/main/resources/mapper/emis/EmisWaybillBatchStatusMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillBatchStatusMapper.xml similarity index 100% rename from emis-biz/src/main/resources/mapper/emis/EmisWaybillBatchStatusMapper.xml rename to emis-biz/src/main/resources/mapper/EmisWaybillBatchStatusMapper.xml