From 44b8d37353290dc34bad7e747b19d18fb928e3b3 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Thu, 24 Jul 2025 09:45:23 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=E6=8F=90=E6=88=90=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=96=B9=E6=A1=88-=E5=BC=A0=E5=AE=B6=E6=B8=AF?=
 =?UTF-8?q?=E7=AB=99=E7=82=B9=E5=AE=A2=E6=9C=8D=E9=9D=9E=E4=B8=9C=E5=8D=97?=
 =?UTF-8?q?=E4=BA=9A=E6=8F=90=E6=88=90=E7=BB=B4=E6=8A=A42506-=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E8=AE=A1=E7=AE=97=E6=8F=90=E6=88=90bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/EmisCommissionQuoteMapper.xml     | 2 +-
 .../mapper/{emis => }/EmisSalesCommissionRatioMapper.xml        | 0
 .../mapper/{emis => }/EmisTmsSiteBatchMissRecordMapper.xml      | 0
 .../mapper/{emis => }/EmisWaybillBatchStatusMapper.xml          | 0
 4 files changed, 1 insertion(+), 1 deletion(-)
 rename emis-biz/src/main/resources/mapper/{emis => }/EmisSalesCommissionRatioMapper.xml (100%)
 rename emis-biz/src/main/resources/mapper/{emis => }/EmisTmsSiteBatchMissRecordMapper.xml (100%)
 rename emis-biz/src/main/resources/mapper/{emis => }/EmisWaybillBatchStatusMapper.xml (100%)

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 @@
 
             <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 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="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>
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