From bc1f282f1cc9bdad3225ec8d1acea44d7835aba6 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 15 Nov 2021 14:00:49 +0800
Subject: [PATCH] 1.分公司权限

---
 src/main/java/org/springblade/modules/system/mapper/UserMapper.xml |    5 ++++-
 1 files changed, 4 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 514ce03..96c11eb 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -95,7 +95,7 @@
             and bu.hold = #{user.hold}
         </if>
         <if test="user.deptId!=null and user.deptId != ''">
-            and bu.dept_id = #{user.deptId}
+            and (bd.id = #{user.deptId} or bd.parent_id = #{user.deptId})
         </if>
         <if test="user.roleId!=null and user.roleId != ''">
             and bu.role_id = #{user.roleId}
@@ -109,6 +109,9 @@
         <if test="user.trainingUnitId!=null and user.trainingUnitId != ''">
             and str.training_unit_id = #{user.trainingUnitId}
         </if>
+        <if test="user.deptName!=null and user.deptName != ''">
+            and  bd.dept_name like concat('%', #{user.deptName},'%')
+        </if>
         <if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction!='1372091709474910209'">
             and (sj.id = #{user.jurisdiction} or sj.parent_id = #{user.jurisdiction})
         </if>

--
Gitblit v1.9.3