From 4ddd3e7456b2afe79cccf7c9f5960ea2023231f1 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 30 Nov 2023 17:49:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
index cb71fb9..5643286 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -99,6 +99,9 @@
<if test="household.name!=null and household.name !=''">
and jh.name like concat('%',#{household.name},'%')
</if>
+ <if test="household.houseCode!=null and household.houseCode !=''">
+ and jh.house_code = #{household.houseCode}
+ </if>
<if test="household.phoneNumber!=null and household.phoneNumber !=''">
and jh.phone_number like concat('%',#{household.phoneNumber},'%')
</if>
@@ -114,7 +117,7 @@
</select>
<!--查询房屋集合信息-->
- <select id="selectHouseNodeList" resultType="org.springblade.common.node.TreeNode" >
+ <select id="selectHouseNodeList" resultType="org.springblade.common.node.TreeStringNode" >
select jh.house_code as id,
jh.house_code as houseCode,
jda.address_name as name,
--
Gitblit v1.9.3