From 8ef6f97f8baba46696463c903edf9d61a8ede531 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Tue, 19 Dec 2023 10:48:22 +0800
Subject: [PATCH] 房屋查询无数据修改，户室查询新增人名搜索查询
---
src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml | 3 +++
src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml | 4 ++--
src/main/java/org/springblade/modules/house/vo/HouseParam.java | 5 +++++
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
index 1e3dd6e..641c412 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
+++ b/src/main/java/org/springblade/modules/doorplateAddress/mapper/DoorplateAddressMapper.xml
@@ -170,6 +170,9 @@
and house_name != ''
and doorplate_type = '户室牌'
and building_code = #{houseParam.code}
+ <if test="houseParam.searchKey!=null and houseParam.searchKey!=''">
+ and jh.name like concat('%',#{houseParam.searchKey},'%')
+ </if>
<include refid="filterHouseGrid"/>
)
union all
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 3db9562..5e6d16b 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseMapper.xml
@@ -161,8 +161,8 @@
jh.*,
jhl.id as cid,jhl.*,jhl.remark as cremark
from jczz_house jh
- left join jczz_user_house_label jhl on jh.house_code = jhl.house_code
- where jh.is_deleted = 0 and jhl.lable_type = 2
+ left join jczz_user_house_label jhl on jh.house_code = jhl.house_code and jhl.lable_type = 2
+ where jh.is_deleted = 0
and jh.house_code = #{house.houseCode}
</select>
diff --git a/src/main/java/org/springblade/modules/house/vo/HouseParam.java b/src/main/java/org/springblade/modules/house/vo/HouseParam.java
index 7834ffa..ca74f12 100644
--- a/src/main/java/org/springblade/modules/house/vo/HouseParam.java
+++ b/src/main/java/org/springblade/modules/house/vo/HouseParam.java
@@ -51,4 +51,9 @@
* 商超写字楼名称
*/
private String userId;
+
+ /**
+ * 搜索key
+ */
+ private String searchKey;
}
--
Gitblit v1.9.3