From 7f3e8c355d5cb8e6200dc61cf31849f02ad472fa Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 20 Dec 2024 07:57:09 +0800
Subject: [PATCH] md

---
 .../resources/mapper/EmisCountryMapper.xml    | 28 +++++++++++++------
 .../resources/mapper/EmisRegionMapper.xml     | 20 +++++++++++--
 2 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/emis-oms-biz/src/main/resources/mapper/EmisCountryMapper.xml b/emis-oms-biz/src/main/resources/mapper/EmisCountryMapper.xml
index b526888..f844021 100644
--- a/emis-oms-biz/src/main/resources/mapper/EmisCountryMapper.xml
+++ b/emis-oms-biz/src/main/resources/mapper/EmisCountryMapper.xml
@@ -27,14 +27,26 @@
         <include refid="selectEmisCountryVo"/>
         <where>
             <if test="id != null "> and id = #{id}</if>
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="nameEn != null  and nameEn != ''"> and name_en like concat('%', #{nameEn}, '%')</if>
-            <if test="code != null  and code != ''"> and code like concat('%', #{code}, '%')</if>
-            <if test="telAreaCode != null  and telAreaCode != ''"> and tel_area_code like concat('%', #{telAreaCode}, '%')</if>
-            <if test="isoCode != null  and isoCode != ''"> and iso_code like concat('%', #{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="twoCode != null  and twoCode != ''"> and two_code like concat('%', #{twoCode}, '%')</if>
-            <if test="threeCode != null  and threeCode != ''"> and three_code like concat('%', #{threeCode}, '%')</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="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>
             <if test="tenantId != null  and tenantId != ''"> and tenant_id like concat('%', #{tenantId}, '%')</if>
             <if test="delFlag != null  and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
diff --git a/emis-oms-biz/src/main/resources/mapper/EmisRegionMapper.xml b/emis-oms-biz/src/main/resources/mapper/EmisRegionMapper.xml
index d9fca10..35f9304 100644
--- a/emis-oms-biz/src/main/resources/mapper/EmisRegionMapper.xml
+++ b/emis-oms-biz/src/main/resources/mapper/EmisRegionMapper.xml
@@ -35,11 +35,27 @@
         <where>
             <if test="id != null "> and id = #{id}</if>
             <if test="regionCode != null  and regionCode != ''"> and region_code=#{regionCode}</if>
-            <if test="regionName != null  and regionName != ''"> and region_name like concat('%', #{regionName}, '%')</if>
-            <if test="regionNameEn != null  and regionNameEn != ''"> and region_name_en like concat('%', #{regionNameEn}, '%')</if>
+            <if test="regionName != null  and regionName != ''">
+                and (
+                region_name like concat('%', #{regionName}, '%')
+                or ( region_name_en!='' and region_name_en like concat('%', #{regionName}, '%') )
+                or #{regionName} like concat('%',region_name, '%')
+                or ( region_name_en!='' and #{regionName} like concat('%',region_name_en, '%') )
+                )
+            </if>
+            <if test="regionNameEn != null  and regionNameEn != ''">
+                and (
+                region_name like concat('%', #{regionName}, '%')
+                or ( region_name_en!='' and region_name_en like concat('%', #{regionName}, '%') )
+                or #{regionName} like concat('%',region_name, '%')
+                or ( region_name_en!='' and #{regionName} like concat('%',region_name_en, '%') )
+                )
+
+            </if>
             <if test="regionType != null "> and region_type = #{regionType}</if>
             <if test="shortName != null  and shortName != ''"> and short_name like concat('%', #{shortName}, '%')</if>
             <if test="parentCode != null  and parentCode != ''"> and parent_code=#{parentCode}</if>
+            <if test="sendAreaId != null "> and send_area_id = #{sendAreaId}</if>
             <if test="areaId != null "> and area_id = #{areaId}</if>
             <if test="areaName != null  and areaName != ''"> and area_name like concat('%', #{areaName}, '%')</if>
             <if test="countryCode != null  and countryCode != ''"> and country_code=#{countryCode}</if>