From 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 19 Aug 2021 15:03:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 27 ++++++---------------------
1 files changed, 6 insertions(+), 21 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 82b34a5..28d77b5 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -60,6 +60,10 @@
on
bu.dept_id = bd.id
left join
+ sys_information si
+ on
+ si.departmentid = bd.id
+ left join
sys_live_location sll
on
sll.worker_id = bu.id
@@ -69,12 +73,6 @@
br.id = bu.role_id
where
bu.is_deleted = 0
- <if test="tenantId!=null and tenantId != ''">
- and bu.tenant_id = #{tenantId}
- </if>
- <if test="user.tenantId!=null and user.tenantId != ''">
- and bu.tenant_id = #{user.tenantId}
- </if>
<if test="user.account!=null and user.account != ''">
and bu.account = #{user.account}
</if>
@@ -82,7 +80,7 @@
and bu.hold = #{user.hold}
</if>
<if test="user.deptId!=null and user.deptId != ''">
- and (bd.parent_id = #{user.deptId} or bd.id = #{user.deptId})
+ and bu.dept_id = #{user.deptId}
</if>
<if test="user.roleId!=null and user.roleId != ''">
and bu.role_id = #{user.roleId}
@@ -94,7 +92,7 @@
and bu.status = #{user.status}
</if>
<if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction!='1123598813738675201'">
- and bu.jurisdiction = #{user.jurisdiction}
+ and si.jurisdiction = #{user.jurisdiction}
</if>
<if test="user.realName!=null and user.realName != ''">
and bu.real_name like concat('%', #{user.realName},'%')
@@ -107,19 +105,6 @@
</if>
<if test="user.examinationType!=null and user.examinationType != ''">
and bu.examination_type = #{user.examinationType}
- </if>
- <if test="deptIdList!=null and deptIdList.size>0">
- and bu.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>
ORDER BY bu.id
</select>
--
Gitblit v1.9.3