From 119436169eeb9bfa28f488f78599843345423a02 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 24 Sep 2021 17:00:40 +0800
Subject: [PATCH] 用户查询接口修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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 1fe2ac4..3557454 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -67,6 +67,10 @@
on
si.departmentid = bd.id
left join
+ sys_jurisdiction sj
+ on
+ sj.id = si.jurisdiction
+ left join
sys_live_location sll
on
sll.worker_id = bu.id
@@ -98,7 +102,7 @@
and bu.status = #{user.status}
</if>
<if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction!='1372091709474910209'">
- and si.jurisdiction = #{user.jurisdiction}
+ and (sj.id = #{user.jurisdiction} or sj.parent_id = #{user.jurisdiction})
</if>
<if test="user.realName!=null and user.realName != ''">
and bu.real_name like concat('%', #{user.realName},'%')
@@ -127,6 +131,14 @@
blade_dept bd
on
bd.id = bu.dept_id
+ left join
+ sys_information si
+ on
+ si.departmentid = bd.id
+ left join
+ sys_jurisdiction sj
+ on
+ sj.id = si.jurisdiction
where bu.is_deleted = 0
<if test="user.tenantId!=null and user.tenantId != ''">
and tenant_id = #{user.tenantId}
@@ -155,8 +167,8 @@
<if test="user.hold!=null and user.hold != ''">
and hold = #{user.hold}
</if>
- <if test="user.jurisdiction!=null and user.jurisdiction != ''">
- and jurisdiction = #{user.jurisdiction}
+ <if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction!='1372091709474910209'">
+ and (sj.id = #{user.jurisdiction} or sj.parent_id = #{user.jurisdiction})
</if>
<if test="user.securitynumber!=null and user.securitynumber != ''">
and securitynumber = #{user.securitynumber}
@@ -268,9 +280,9 @@
br.id = bu.role_id
where
bu.is_deleted = 0
- and br.role_alias = "保安"
and
(hold = 2 or hold = 3)
+ and br.role_alias = "保安"
<if test="user.deptId!=null and user.deptId != ''">
and bu.dept_id = #{user.deptId}
</if>
--
Gitblit v1.9.3