From 3315f3703d7dd02dc96da30d5e1a79cf17984ad5 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 17 Nov 2024 23:32:28 +0800
Subject: [PATCH] md

---
 .../src/main/resources/mapper/EmisRegionMapper.xml   | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisRegionMapper.xml b/emis-biz/src/main/resources/mapper/EmisRegionMapper.xml
index 57e19016e..f0a8fee96 100644
--- a/emis-biz/src/main/resources/mapper/EmisRegionMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisRegionMapper.xml
@@ -38,14 +38,18 @@
             <if test="regionCode != null  and regionCode != ''"> and region_code=#{regionCode}</if>
             <if test="regionName != null  and regionName != ''">
              and (
-                region_name like concat('%', #{regionName}, '%') or region_name_en like concat('%', #{regionName}, '%')
-                or #{regionName} like concat('%',region_name, '%') or #{regionName} like concat('%',region_name_en, '%')
+                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 like concat('%', #{regionName}, '%')
-                    or #{regionName} like concat('%',region_name, '%') or #{regionName} like concat('%',region_name_en, '%')
+                    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>