aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'develop' (#187) from develop into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-service/pulls/187
This commit is contained in:
heyu 2025-09-13 16:59:56 +08:00
commit 476c3f7b9f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml
View File

@ -49,8 +49,8 @@
<if test="quoteId != null "> and quote_id = #{quoteId}</if>
<if test="quoteCode != null and quoteCode != ''"> and quote_code like concat('%', #{quoteCode}, '%')</if>
<if test="quoteName != null and quoteName != ''"> and quote_name like concat('%', #{quoteName}, '%')</if>
<if test="fromCountry != null and fromCountry != ''"> and ( FIND_IN_SET(#{fromCountry},from_country) or from_country='-1')</if>
<if test="country != null and country != ''"> and ( FIND_IN_SET(#{country},country) or country='-1' ) </if>
<if test="fromCountry != null and fromCountry != ''"> 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))))</if>
<if test="country != null and country != ''"> 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))) ) </if>
<if test="sendSiteCode != null and sendSiteCode != ''"> and ( ( FIND_IN_SET(#{sendSiteCode},send_site_code) and send_site_code is not null ) or send_site_code is null ) </if>
<if test="nextSiteCode != null and nextSiteCode != ''"> and ( ( FIND_IN_SET(#{nextSiteCode},next_site_code) and next_site_code is not null ) or next_site_code is null ) </if>
@ -99,8 +99,8 @@
</if>
<if test="quoteName != null and quoteName != ''"> and quote_name like concat('%', #{quoteName}, '%')</if>
<if test="fromCountry != null and fromCountry != ''"> 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')</if>
<if test="country != null and country != ''"> and ( FIND_IN_SET(#{country},country) or country='-1' or country is null or country='' or ( #{country}!='0086' and country='-2' ) or country='-3' ) </if>
<if test="fromCountry != null and fromCountry != ''"> 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))))</if>
<if test="country != null and country != ''"> 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))) ) </if>
<if test="sendSiteCode != null and sendSiteCode != ''"> and ( ( FIND_IN_SET(#{sendSiteCode},send_site_code) and send_site_code is not null ) or send_site_code is null ) </if>
<if test="nextSiteCode != null and nextSiteCode != ''"> and ( ( FIND_IN_SET(#{nextSiteCode},next_site_code) and next_site_code is not null ) or next_site_code is null ) </if>
@ -333,4 +333,4 @@
</where>
order by create_time desc
</select>
</mapper>
</mapper>