From 5fd47c20d64ec1b09a30cdaeef20c4ccbaad5376 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Tue, 26 Mar 2024 11:57:04 +0800
Subject: [PATCH] 用户名修改成住户名称
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 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 f315c40..0b87927 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -233,20 +233,23 @@
)
</select>
- <select id="getUserInfoByDistrictIds" resultType="org.springblade.modules.system.entity.User">
+ <select id="getUserInfoByDistrictIds" resultType="org.springblade.modules.house.vo.HouseholdVO">
SELECT
+ jhe.house_name address,
bu.id,
bu.tenant_id,
bu.code,
bu.user_type,
bu.account,
- bu.name,
+ jh.name,
bu.real_name,
bu.avatar,
bu.email,
- bu.phone,
- bu.birthday
+ bu.phone phoneNumber,
+ 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
@@ -259,14 +262,17 @@
</foreach>
and bu.is_deleted = 0
and jh.relationship !=18
- <if test="param2 != null and param2 !=''">
- and jhe.building like concat('%',#{param2},'%')
+ <if test="vo.building != null and vo.building !=''">
+ and jhe.building like concat('%',#{vo.building},'%')
</if>
- <if test="param3 != null and param3 !=''">
- and jhe.unit like concat('%',#{param3},'%')
+ <if test="vo.unit != null and vo.unit !=''">
+ and jhe.unit like concat('%',#{vo.unit},'%')
</if>
- <if test="param4 != null and param4 !=''">
- and jh.name like concat('%',#{param4},'%')
+ <if test="vo.name != null and vo.name !=''">
+ and jh.name like concat('%',#{vo.name},'%')
+ </if>
+ <if test="vo.phoneNumber != null and vo.phoneNumber !=''">
+ and jh.phone_number like concat('%',#{vo.phoneNumber},'%')
</if>
</where>
</select>
--
Gitblit v1.9.3