From 77fea47f1fa683f9a0356df3d2328e2bb68b28cf Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 18 Jan 2024 17:56:22 +0800
Subject: [PATCH] 数据过滤调整
---
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 3d5b270..d859087 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},'%')
@@ -67,7 +77,7 @@
jg.id,
jg.grid_name,
br.name as community_name,
- sort,
+ jg.sort,
bu.real_name AS realName,
bu.phone AS gridPhone
FROM
--
Gitblit v1.9.3