From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml b/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml
index ffbffac..0830adb 100644
--- a/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml
@@ -232,7 +232,7 @@
         SELECT
         code,parent_code,name,ancestors,region_level,sort
         FROM blade_region
-        where ancestors like concat('%',#{regionCode},'%')
+        where (ancestors like concat('%',#{regionCode},'%') or code = #{regionCode})
         union all
         (
         SELECT
@@ -244,7 +244,7 @@
         jg.sort
         FROM blade_region br
         right join jczz_grid jg on jg.community_code = br.village_code and jg.is_deleted = 0
-        where br.ancestors like concat('%',#{regionCode},'%')
+        where (br.ancestors like concat('%',#{regionCode},'%') or br.code = #{regionCode})
         )
     </select>
 

--
Gitblit v1.9.3