From 2d226c685ce008fb741f99e9e86db65f43f83508 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 24 Sep 2021 17:42:15 +0800
Subject: [PATCH] 保安员查询修改

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml |    6 +++++-
 1 files changed, 5 insertions(+), 1 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 53dcc37..79a047b 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},'%')

--
Gitblit v1.9.3