From bd92c2ab5b7baee24cb8204a3856c9de188a4f97 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 25 Dec 2023 21:53:18 +0800
Subject: [PATCH] 区域查询修改，场所，房屋，住户，租赁，网格信息区域过滤，机构新增区域字段
---
src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml | 6 +++++-
1 files changed, 5 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..ffe17f8 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridMapper.xml
@@ -20,16 +20,20 @@
<if test="grid.principalPhone!=null and grid.principalPhone!=''">
and principal_phone like concat('%',#{grid.principalPhone},'%')
</if>
+ <if test="grid.regionCode != null and grid.regionCode !='' ">
+ and community_code like concat('%',#{grid.regionCode},'%')
+ </if>
</select>
<!--根据地址编号查询网格数据-->
<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