From c2cd507da74f1841d0133d4c9bff9025ce1066ba Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 09 七月 2024 10:00:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev'
---
src/main/java/com/mindskip/xzs/configuration/spring/security/RestAuthenticationProvider.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/configuration/spring/security/RestAuthenticationProvider.java b/src/main/java/com/mindskip/xzs/configuration/spring/security/RestAuthenticationProvider.java
index d11b5d3..5104811 100644
--- a/src/main/java/com/mindskip/xzs/configuration/spring/security/RestAuthenticationProvider.java
+++ b/src/main/java/com/mindskip/xzs/configuration/spring/security/RestAuthenticationProvider.java
@@ -66,8 +66,11 @@
grantedAuthorities.add(new SimpleGrantedAuthority(RoleEnum.DEPT_ADMIN.getRoleName()));
}
grantedAuthorities.add(new SimpleGrantedAuthority(RoleEnum.fromCode(user.getRole()).getRoleName()));
- // 鑾峰彇璇ョ敤鎴风鐞嗛儴闂�
+ // 鑾峰彇璇ョ敤鎴风鐞嗛儴闂ㄥ強鍏朵笅绾�
List<Integer> deptAdminIds = userService.getDeptAdminIds(user.getId());
+ if (! CollectionUtils.isEmpty(deptAdminIds)) {
+ deptAdminIds = departmentMapper.getChilds(deptAdminIds); // 鏌ヨ瀛愰儴闂�
+ }
if (CollectionUtils.isEmpty(deptAdminIds)) {
// 濡傛灉鏄櫘閫氬鍛橈紝鏌ュ嚭鎵�鍦ㄩ儴闂�
deptAdminIds = userService.getDeptIds(user.getId());
--
Gitblit v1.8.0