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 | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 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 d5aebd2..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},'%')
@@ -66,15 +76,16 @@
SELECT
jg.id,
jg.grid_name,
- jg.community_name,
- sort,
+ br.name as community_name,
+ jg.sort,
bu.real_name AS realName,
bu.phone AS gridPhone
FROM
jczz_grid jg
LEFT JOIN jczz_gridman jgm on jg.id = jgm.grid_id
LEFT JOIN jczz_grid_range jgr ON jg.id = jgr.grid_id
- LEFT JOIN jczz_place_rel jpr ON locate( jpr.community_name, jg.community_name )> 0
+ LEFT JOIN blade_region br on br.code = jg.community_code
+ LEFT JOIN jczz_place_rel jpr ON locate( jpr.community_name, br.name )> 0
AND locate( jpr.grid_name, jg.grid_name )> 0
AND jpr.is_deleted = 0
LEFT JOIN blade_user bu ON bu.id = jgm.user_id
--
Gitblit v1.9.3