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 @@
and id = #{id}
- and ( three_code=#{name} or two_code=#{name} or name like concat('%', #{name}, '%') or name_en like concat('%', #{name}, '%') )
- and ( three_code=#{name} or two_code=#{name} or name like concat('%', #{nameEn}, '%') or name_en like concat('%', #{nameEn}, '%') )
+ and (
+ three_code=#{name} or
+ two_code=#{name} or
+ name like concat('%', #{name}, '%')
+ or ( name_en!='' and name_en like concat('%', #{name}, '%') )
+
+ )
+ and (
+ three_code=#{name}
+ or two_code=#{name}
+ or ( name!='' and name like concat('%', #{nameEn}, '%') )
+ or ( name_en!='' and name_en like concat('%', #{nameEn}, '%') )
+ )
and find_in_set(code,#{code})
and tel_area_code=#{telAreaCode}
and iso_code=#{isoCode}
- and find_in_set(#{continentId},continent_id) and order_num = #{orderNum}
+ and find_in_set(#{continentId},continent_id)
+ and order_num = #{orderNum}
and two_code=#{twoCode}
and three_code=#{threeCode}
and remark like concat('%', #{remark}, '%')