From 2954ffe7b358d0568e97112c5772678b2d0f0ed6 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Thu, 15 Jan 2026 17:10:51 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=E9=B2=81=E6=B3=B0=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

committer: heyu
---
 .../com/xdadan/erp/emis/service/EmisBaseService.java   |  2 +-
 .../src/main/resources/mapper/EmisCountryMapper.xml    | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
index 2dd6f6ba5..2df55688a 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
@@ -3807,7 +3807,7 @@ public class EmisBaseService {
          }
 
          EmisCountry emisCountry = new EmisCountry();
-         emisCountry.setName(name);
+         emisCountry.getParams().put("name", name);
          List<EmisCountry> list=emisCountryMapper.selectEmisCountryList(emisCountry);
          if(!CollectionUtils.isEmpty(list)) {
              return list.get(0);
diff --git a/emis-biz/src/main/resources/mapper/EmisCountryMapper.xml b/emis-biz/src/main/resources/mapper/EmisCountryMapper.xml
index e4d98fa04..b08398fc4 100644
--- a/emis-biz/src/main/resources/mapper/EmisCountryMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCountryMapper.xml
@@ -56,6 +56,14 @@
             <if test="updateTime != null "> and update_time = #{updateTime}</if>
             <if test="createSite != null  and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
             <if test="updateSite != null  and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
+            <if test="params.name != null and params.name != ''">
+                and (
+                three_code = #{params.name}
+                or two_code = #{params.name}
+                or name = #{params.name}
+                or (name_en != '' and name_en = #{params.name})
+                )
+            </if>
         </where>
 
         <if test="params.codeSortList != null and params.codeSortList.size >0  ">
@@ -164,4 +172,4 @@
             #{id}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>