From 9b8cf1c18a25f2322791a7d2fd268b42f2e01fa1 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 13:30:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 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 cf356fd..2f703b6 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
@@ -24,12 +24,13 @@
<!--根据地址编号查询网格数据-->
<select id="getGridDetailByHouseCode" resultType="org.springblade.modules.grid.vo.GridVO">
- select jg.id,jg.grid_name,jg.community_name,
+ 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 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}
limit 1
--
Gitblit v1.9.3