From 2bd69d1dca40d2fdf07f72e0117d2f0febde5359 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 23 Dec 2023 15:27:02 +0800
Subject: [PATCH] 新增民警楼盘，功能数据过滤
---
src/main/java/org/springblade/modules/grid/mapper/GridmanMapper.xml | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/springblade/modules/grid/mapper/GridmanMapper.xml b/src/main/java/org/springblade/modules/grid/mapper/GridmanMapper.xml
index 90a7c4e..85fed75 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridmanMapper.xml
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridmanMapper.xml
@@ -33,6 +33,9 @@
<if test="gridman.gridId!=null">
and jg.id = #{gridman.gridId}
</if>
+ <if test="gridman.communityCode!=null and gridman.communityCode!=''">
+ and jg.community_code like concat('%',#{gridman.communityCode},'%')
+ </if>
</select>
<!--自定义分页查询-->
@@ -51,14 +54,16 @@
<select id="getGridStatistics" resultType="java.lang.Integer">
SELECT count(1) number
- FROM jczz_grid jg
- LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
+ FROM jczz_gridman jgm
+ LEFT JOIN jczz_grid jg ON jg.id = jgm.grid_id
WHERE jg.community_code = #{code}
- AND jg.is_deleted = 0
+ AND jg.is_deleted = 0
+ <if test="userId!=null and roleType == '1'">
+ and jgm.user_id= #{userId}
+ </if>
</select>
<select id="getCompanyStatistics" resultType="java.lang.Integer">
-
SELECT
count(1)
FROM
@@ -67,9 +72,9 @@
WHERE
jd.community_code = #{code}
and jpcd.is_deleted= 0
- <if test="userId!=null">
- AND EXISTS (
- SELECT
+ <if test="userId!=null and roleType == '1'">
+ AND jd.aoi_code in (
+ SELECT distinct
jda.aoi_code
FROM
jczz_grid jg
@@ -79,10 +84,18 @@
WHERE
jgm.user_id = #{userId}
AND jg.is_deleted = 0
- AND jd.aoi_code = jda.aoi_code
AND jda.aoi_code IS NOT NULL
- GROUP BY
+ )
+ </if>
+
+ <if test="userId != null and roleType == '3'">
+ AND jd.aoi_code IN (SELECT
jda.aoi_code
+ FROM
+ jczz_doorplate_address jda
+ LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
+ WHERE
+ jc.res_police_user_id = #{userId})
)
</if>
--
Gitblit v1.9.3