From aa237538c7e5f71f92372cc6deda1b1fac2e79e5 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 08 Dec 2023 10:48:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml | 8 ++++++--
1 files changed, 6 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 c63e214..6c35a85 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
@@ -86,15 +86,19 @@
<!--自定义分页列表-->
<select id="selectHousePage" resultType="org.springblade.modules.house.vo.HouseVO">
- select *,concat(building," ",unit," ",room) as address from jczz_house
+ select jh.*,concat(building," ",unit," ",room) as address from jczz_house jh
+ left join jczz_doorplate_address jda on jda.address_code = jh.house_code
where is_deleted = 0
<if test="house.id != null "> and id = #{house.id}</if>
+ <if test="house.streetCode != null and house.streetCode != ''">
+ and jda.town_street_code like concat('%',#{house.streetCode},'%')
+ </if>
<if test="house.houseCode != null and house.houseCode != ''"> and house_code = #{house.houseCode}</if>
<if test="house.districtCode != null and house.districtCode != ''"> and district_code = #{house.districtCode}</if>
<if test="house.districtName != null and house.districtName != ''">
and district_name like concat('%',#{house.districtName},'%')
</if>
- <if test="house.houseName != null and house.houseName != ''"> and house_name = #{house.houseName}</if>
+ <if test="house.houseName != null and house.houseName != ''"> and jh.house_name like concat('%',#{house.houseName},'%')</if>
<if test="house.phone != null and house.phone != ''"> and phone = #{house.phone}</if>
<if test="house.area != null "> and area = #{house.area}</if>
<if test="house.propertyPrice != null "> and property_price = #{house.propertyPrice}</if>
--
Gitblit v1.9.3