From 957bd52e5217bfd334862911f6e4392f179419cc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 29 Dec 2023 14:02:00 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 49 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 40 insertions(+), 9 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 0c17a3d..a6d245d 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -50,15 +50,15 @@
</if>
<if test="deptIdList!=null and deptIdList.size>0">
and id in (
- SELECT
- user_id
- FROM
- blade_user_dept
- WHERE
- dept_id IN
- <foreach collection="deptIdList" index="index" item="item" open="(" separator="," close=")">
- #{item}
- </foreach>
+ SELECT
+ user_id
+ FROM
+ blade_user_dept
+ WHERE
+ dept_id IN
+ <foreach collection="deptIdList" index="index" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
)
</if>
ORDER BY id
@@ -144,6 +144,37 @@
id = #{id}
</select>
+ <select id="getUserInfoByDistrictId"
+ resultType="org.flowable.idm.engine.impl.persistence.entity.UserEntity">
+ SELECT
+ bu.id,
+ bu.tenant_id,
+ bu.code,
+ bu.user_type,
+ bu.account,
+ bu.name,
+ bu.real_name,
+ bu.avatar,
+ bu.email,
+ bu.phone,
+ bu.birthday
+ FROM
+ blade_user bu
+ LEFT JOIN jczz_household jh ON bu.id = jh.associated_user_id
+ LEFT JOIN jczz_house jhe ON jhe.house_code = jh.house_code
+ LEFT JOIN jczz_district jd on jd.aoi_code=jhe.district_code
+ <where>
+ <if test="districtId != nuu and districtId != ''">
+ and jd.id = #{districtId}
+ and bu.is_deleted = 0
+ </if>
+ <if test="building != nuu and building != ''">
+ and jhe.building=#{building}
+ </if>
+
+ </where>
+
+ </select>
</mapper>
--
Gitblit v1.9.3