From 36063058fe99965c9b628bc4b144bd0c955709fb Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 17 Nov 2024 23:35:54 +0800
Subject: [PATCH] md

---
 .../resources/mapper/EmisCountryMapper.xml     | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisCountryMapper.xml b/emis-biz/src/main/resources/mapper/EmisCountryMapper.xml
index bb3f3ee2c..3ada4781d 100644
--- a/emis-biz/src/main/resources/mapper/EmisCountryMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCountryMapper.xml
@@ -27,12 +27,24 @@
         <include refid="selectEmisCountryVo"/>
         <where>
             <if test="id != null "> and id = #{id}</if>
-            <if test="name != null  and name != ''"> and ( three_code=#{name} or two_code=#{name} or name like concat('%', #{name}, '%') or name_en like concat('%', #{name}, '%') )</if>
-            <if test="nameEn != null  and nameEn != ''"> and ( three_code=#{name} or two_code=#{name} or name like concat('%', #{nameEn}, '%') or name_en like concat('%', #{nameEn}, '%') ) </if>
+            <if test="name != null  and name != ''"> and (
+                        three_code=#{name} or
+                        two_code=#{name} or
+                        name like concat('%', #{name}, '%')
+                        or ( name_en!='' and name_en like concat('%', #{name}, '%') )
+
+                    )</if>
+            <if test="nameEn != null  and nameEn != ''"> and (
+                    three_code=#{name}
+                    or two_code=#{name}
+                    or  ( name!='' and  name like concat('%', #{nameEn}, '%') )
+                    or ( name_en!=''  and name_en like concat('%', #{nameEn}, '%') )
+                ) </if>
             <if test="code != null  and code != ''"> and find_in_set(code,#{code})</if>
             <if test="telAreaCode != null  and telAreaCode != ''"> and tel_area_code=#{telAreaCode}</if>
             <if test="isoCode != null  and isoCode != ''"> and iso_code=#{isoCode}</if>
-            <if test="continentId != null  and continentId != ''"> and find_in_set(#{continentId},continent_id)</if>            <if test="orderNum != null "> and order_num = #{orderNum}</if>
+            <if test="continentId != null  and continentId != ''"> and find_in_set(#{continentId},continent_id)</if>
+             <if test="orderNum != null "> and order_num = #{orderNum}</if>
             <if test="twoCode != null  and twoCode != ''"> and two_code=#{twoCode}</if>
             <if test="threeCode != null  and threeCode != ''"> and three_code=#{threeCode}</if>
             <if test="remark != null  and remark != ''"> and remark like concat('%', #{remark}, '%')</if>