From 8bbcf203caac16c26ef879e0d85ceed1c6f061f4 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 22 Jan 2024 10:21:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/grid/mapper/GridmanMapper.xml | 38 ++++++++++++++++++++------------------
1 files changed, 20 insertions(+), 18 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 0f3c3bb..fc69a04 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridmanMapper.xml
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridmanMapper.xml
@@ -25,7 +25,7 @@
br.name as communityName,
br.town_name as townName
from jczz_gridman jgm
- left join jczz_grid jg on jg.id = jgm.grid_id and jg.is_deleted = 0
+ left join jczz_grid jg on jg.grid_code = jgm.grid_code and jg.is_deleted = 0
left join blade_region br on br.code = jg.community_code
where jgm.is_deleted = 0
<if test="gridman.gridmanName!=null and gridman.gridmanName!=''">
@@ -78,7 +78,7 @@
<select id="getGridStatistics" resultType="java.lang.Integer">
SELECT count(1) number
FROM jczz_gridman jgm
- LEFT JOIN jczz_grid jg ON jg.id = jgm.grid_id
+ LEFT JOIN jczz_grid jg ON jg.grid_code = jgm.grid_code
WHERE jg.community_code = #{code}
AND jg.is_deleted = 0
<if test="userId!=null and roleType == '1'">
@@ -101,9 +101,8 @@
jda.aoi_code
FROM
jczz_grid jg
- LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
- LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id
- LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jgr.house_code
+ LEFT JOIN jczz_gridman jgm ON jg.grid_code = jgm.grid_code
+ LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jg.house_code
WHERE
jgm.user_id = #{userId}
AND jg.is_deleted = 0
@@ -126,9 +125,8 @@
jda.aoi_code
FROM
jczz_grid jg
- LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
- LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id
- LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jgr.house_code
+ LEFT JOIN jczz_gridman jgm ON jg.grid_code = jgm.grid_code
+ LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jg.house_code
WHERE
jgm.user_id = #{userId}
AND jg.is_deleted = 0
@@ -143,7 +141,7 @@
select
jgm.*,jg.community_code communityCode
from jczz_gridman jgm
- left join jczz_grid jg on jg.id = jgm.grid_id and jg.is_deleted = 0
+ left join jczz_grid jg on jg.grid_code = jgm.grid_code and jg.is_deleted = 0
where jgm.is_deleted = 0
and jgm.id = #{gridman.id}
</select>
@@ -159,14 +157,18 @@
</select>
<select id="getGridManByCode" resultType="org.springblade.modules.system.entity.User">
-SELECT
- *
-FROM
- blade_user bu
- LEFT JOIN jczz_gridman jgm ON bu.id = jgm.user_id
- LEFT JOIN jczz_grid jg ON jgm.grid_id = jg.id
-WHERE
- jg.community_code IN ( SELECT jg.community_code FROM jczz_grid jg LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id WHERE jgr.house_code = #{houseCode} )
- AND bu.is_deleted = 0
+ SELECT
+ bu.*
+ FROM
+ blade_user bu
+ LEFT JOIN jczz_gridman jgm ON bu.id = jgm.user_id
+ LEFT JOIN jczz_grid jg ON jgm.grid_code = jg.grid_code
+ WHERE
+ jg.community_code IN
+ (
+ SELECT jg.community_code FROM jczz_grid jg LEFT JOIN jczz_grid_range jgr ON jgr.grid_id = jg.id
+ WHERE jgr.house_code = #{houseCode}
+ )
+ AND bu.is_deleted = 0
</select>
</mapper>
--
Gitblit v1.9.3