From f655dd8373a0bc767115c3a4490bc3e3b0d05ec3 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 19 Aug 2021 10:59:18 +0800
Subject: [PATCH] 保安员查询修改

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml |   21 +--------------------
 1 files changed, 1 insertions(+), 20 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 e71440d..14ca0fd 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -69,12 +69,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 +76,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}
@@ -107,19 +101,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