From b16c82bb757d8726d42da4b3f4e5855fce669066 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Sat, 13 Sep 2025 16:37:28 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20TMS=E7=B3=BB=E7=BB=9F=20-=20?=
=?UTF-8?q?=E6=8F=90=E6=88=90=E7=AE=A1=E7=90=86=20-=20=E8=BF=90=E5=8D=95?=
=?UTF-8?q?=E6=8F=90=E6=88=90=E6=98=8E=E7=BB=86=20-=20=E4=BF=AE=E5=A4=8D?=
=?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=9D=9E=E4=B8=9C=E5=8D=97=E4=BA=9A=E5=9B=BD?=
=?UTF-8?q?=E5=AE=B6=E6=8F=90=E6=88=90=E6=97=B6=EF=BC=8C=E8=AE=A1=E7=AE=97?=
=?UTF-8?q?=E4=B8=8D=E5=87=86=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
committer: heyu
---
.../resources/mapper/EmisCommissionQuoteMapper.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
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
+