From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index aced6ff..36e57d5 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -233,10 +233,12 @@
)
</select>
- <select id="getUserInfoByDistrictIds" resultType="org.springblade.modules.system.entity.User">
+ <select id="getUserInfoByDistrictIds" resultType="org.springblade.modules.house.vo.HouseholdVO">
SELECT
- bu.id,
+ jh.building,
+ jh.unit,
+ bu.id userId,
bu.tenant_id,
bu.code,
bu.user_type,
@@ -246,7 +248,9 @@
bu.avatar,
bu.email,
bu.phone,
- bu.birthday
+ bu.birthday,
+ jhe.building,
+ jhe.unit
FROM
blade_user bu
LEFT JOIN jczz_household jh ON bu.id = jh.associated_user_id and jh.is_deleted=0
@@ -258,6 +262,16 @@
#{item}
</foreach>
and bu.is_deleted = 0
+ and jh.relationship !=18
+ <if test="param2 != null and param2 !=''">
+ and jhe.building like concat('%',#{param2},'%')
+ </if>
+ <if test="param3 != null and param3 !=''">
+ and jhe.unit like concat('%',#{param3},'%')
+ </if>
+ <if test="param4 != null and param4 !=''">
+ and jh.name like concat('%',#{param4},'%')
+ </if>
</where>
</select>
--
Gitblit v1.9.3