From 91e2a286bb5b72172bb2e2d5f96be03439c51f72 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 08 Dec 2023 10:46:24 +0800
Subject: [PATCH] 驾驶舱代码

---
 src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml |   33 +++++++++++++++++++++++----------
 1 files changed, 23 insertions(+), 10 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 19056ee..9098df6 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
@@ -28,9 +28,11 @@
         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 blade_user bu on bu.id = jg.user_id and bu.is_deleted = 0
+        left join jczz_gridman jgm on jg.id = jgm.grid_id and jgm.is_deleted = 0
+        left join blade_user bu on bu.id = jgm.user_id and bu.is_deleted = 0
         where jg.is_deleted = 0
         and jgr.house_code = #{houseCode}
+        limit 1
     </select>
 
     <!--根据用户id(网格员)查询对应的房屋地址code-->
@@ -49,15 +51,26 @@
 
     <!--根据地址编号查询网格数据-->
     <select id="getGridDetailByParam" resultType="org.springblade.modules.grid.vo.GridVO">
-        select jg.id,jg.grid_name,jg.community_name,sort,
-        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_place_rel jpr on locate(jpr.community_name,jg.community_name)>0 and locate(jpr.grid_name,jg.grid_name)>0 and jpr.is_deleted = 0
-        left join blade_user bu on bu.id = jg.user_id and bu.is_deleted = 0
-        where jg.is_deleted = 0
-        and jpr.place_id = #{place.id}
-        limit 1
+        SELECT
+            jg.id,
+            jg.grid_name,
+            jg.community_name,
+            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
+                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
+                AND bu.is_deleted = 0
+        WHERE
+          jg.is_deleted = 0
+          and jpr.place_id = #{place.id}
+          limit 1
     </select>
 
     <!--自定义详情查询-->

--
Gitblit v1.9.3