From 494aeb58eb885b40ab2fdb083aaa79007bb79ae2 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 19 Jan 2024 17:46:23 +0800
Subject: [PATCH] bug 修复
---
src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml b/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
index c10d128..981f7ee 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
@@ -22,8 +22,18 @@
<if test="grid.principalPhone!=null and grid.principalPhone!=''">
and jg.principal_phone like concat('%',#{grid.principalPhone},'%')
</if>
- <if test="grid.regionCode != null and grid.regionCode !='' ">
- and jg.community_code like concat('%',#{grid.regionCode},'%')
+ <if test="isAdministrator==2">
+ <choose>
+ <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+ and jg.community_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ </when>
+ <otherwise>
+ and jg.community_code in ('')
+ </otherwise>
+ </choose>
</if>
<if test="grid.communityName != null and grid.communityName !='' ">
and br.name like concat('%',#{grid.communityName},'%')
@@ -104,7 +114,7 @@
parent_code as parentId,
name
FROM blade_region
- where district_code = '361102'
+ where district_code = '361102000000'
union all
(select id,
community_code as parentId,
--
Gitblit v1.9.3