From 31b6aefacbee9dde61be6afcb7c6dbbf7c6baa7d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 02 Jan 2024 17:51:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
index a9df469..fd70ca7 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
@@ -134,7 +134,8 @@
select
jh.*,
concat(jh.building," ",jh.unit," ",jh.room) as address,
- br.town_name as townStreetName,br.name as neiName
+ br.town_name as townStreetName,br.name as neiName,
+ jg.grid_name
from jczz_house jh
left join jczz_grid_range jgr on jgr.house_code = jh.house_code
left join jczz_grid jg on jg.id = jgr.grid_id and jg.is_deleted = 0
@@ -166,7 +167,7 @@
<if test="house.room != null and house.room != ''"> and jh.room = #{house.room}</if>
<if test="house.buildingNo != null "> and jh.building_no = #{house.buildingNo}</if>
<if test="house.regionCode != null and house.regionCode !='' ">
- and jda.nei_code like concat('%',#{house.regionCode},'%')
+ and jg.community_code like concat('%',#{house.regionCode},'%')
</if>
</select>
--
Gitblit v1.9.3