From cb61acd5c6735788b68e1031e85a0dab244f40aa Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Sat, 20 Jan 2024 17:56:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 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 981f7ee..a584db6 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
@@ -44,16 +44,16 @@
</select>
<!--根据地址编号查询网格数据-->
- <select id="getGridDetailByHouseCode" resultType="org.springblade.modules.grid.vo.GridVO">
+ <select id="getPlaceGridDetailByHouseCode" resultType="org.springblade.modules.grid.vo.GridVO">
select jg.id,jg.grid_name,br.town_name AS townStreetName,br.name AS community_name,
bu.real_name as realName,bu.phone as gridPhone
from jczz_grid jg
- left join jczz_grid_range jgr on jg.id = jgr.grid_id
- left join jczz_gridman jgm on jg.id = jgm.grid_id and jgm.is_deleted = 0
+ left join jczz_place jp on jp.grid_code = jg.grid_code and jp.is_deleted = 0
+ left join jczz_gridman jgm on jg.grid_code = jgm.grid_code and jgm.is_deleted = 0
left join blade_user bu on bu.id = jgm.user_id and bu.is_deleted = 0
left join blade_region br ON br.code = jg.community_code
where jg.is_deleted = 0
- and jgr.house_code = #{houseCode}
+ and jp.house_code = #{houseCode}
limit 1
</select>
@@ -172,4 +172,15 @@
GROUP BY jg.grid_name
</select>
+ <!--查询对应网格人对应的网格-->
+ <select id="getGridByUserId" resultType="org.springblade.modules.grid.entity.GridEntity">
+ select
+ jg.*
+ from jczz_grid jg
+ where jg.grid_code in
+ (
+ select * from (select grid_code from jczz_gridman where is_deleted = 0 and user_id = #{userId} limit 1) a
+ )
+ </select>
+
</mapper>
--
Gitblit v1.9.3