From 882385e601e57cf93227d05bf70749d7ac110f23 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 15:24:18 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/grid/mapper/GridmanMapper.xml | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 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 028ca06..85fed75 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridmanMapper.xml
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridmanMapper.xml
@@ -54,17 +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
- <if test="userId!=null">
+ 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
@@ -73,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
@@ -85,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