From 47712cc6cd4d52fcd1dde44e2a400ccbb9c6ae7a Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 12 Apr 2024 15:20:49 +0800
Subject: [PATCH] 民警网格区域查询合并，网格员区域树查询修改，解决不显示网格问题
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 63 +++++++++++++------------------
1 files changed, 26 insertions(+), 37 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..b4bd4a0 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -74,7 +74,32 @@
</select>
<select id="exportUser" resultType="org.springblade.modules.system.excel.UserExcel">
- SELECT id, tenant_id, user_type, account, name, real_name, email, phone, birthday, role_id, dept_id, post_id FROM blade_user ${ew.customSqlSegment}
+ SELECT id,
+ tenant_id,
+ user_type,
+ account,
+ name,
+ real_name,
+ email,
+ phone,
+ birthday,
+ role_id,
+ dept_id,
+ post_id
+ FROM blade_user ${ew.customSqlSegment}
+ <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>
+ )
+ </if>
</select>
<!--按条件查询用户信息-->
@@ -233,43 +258,7 @@
)
</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 and jh.is_deleted=0
- 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
- 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>
<select id="selectUserByDept" resultMap="userResultMap">
--
Gitblit v1.9.3