From 0b1e9e70818f0e3eb32dd6c029d42d93236ecdc6 Mon Sep 17 00:00:00 2001
From: zrj <646384940@qq.com>
Date: Wed, 03 Jul 2024 12:07:01 +0800
Subject: [PATCH] 数据同步新增连接池配置
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 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 a3e9195..ccd39d3 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -98,7 +98,7 @@
jd.id = #{districtId}
and bu.is_deleted = '0'
and jh.is_deleted = '0'
-
+ and jh.role_type = '1'
</select>
<!--根据手机号查询对应账号和手机号的用户信息-->
@@ -109,8 +109,8 @@
<!--用户详情map-->
<resultMap id="selectUserDetailMap" type="org.springblade.modules.system.vo.UserDetailVO" autoMapping="true">
- <id property="id" column="id" />
- <collection property="deptList" javaType="java.util.List"
+ <id property="id" column="id"/>
+ <collection property="deptList" javaType="java.util.List"
ofType="org.springblade.modules.system.vo.DeptDetailVO" autoMapping="true">
<id property="id" column="cid"/>
<id property="level" column="region_level"/>
@@ -182,11 +182,11 @@
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 != ''">
+ <if test="districtId != null and districtId != ''">
and jd.id = #{districtId}
and bu.is_deleted = 0
</if>
- <if test="building != nuu and building != ''">
+ <if test="building != null and building != ''">
and jhe.building=#{building}
</if>
@@ -224,10 +224,38 @@
( SELECT id, parent_id FROM blade_dept ORDER BY parent_id, id ) org_query,
(SELECT @id := #{deptId} ) initialisation
WHERE
- FIND_IN_SET( parent_id, @id ) > 0 AND @id := CONCAT( @id, ',', id )
+ (FIND_IN_SET( parent_id, @id ) > 0 or FIND_IN_SET( id, @id ) > 0)
+ AND @id := CONCAT( @id, ',', id )
)
</select>
+ <select id="getUserInfoByDistrictIds" resultType="org.springblade.modules.system.entity.User">
+
+ 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>
+ and jd.id in
+ <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
+ #{item}
+ </foreach>
+ and bu.is_deleted = 0
+ </where>
+ </select>
</mapper>
--
Gitblit v1.9.3