From ca52d40005e5a1fb7dd2f9d95d8caea6c538d14a Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 16 七月 2024 09:56:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/configuration/spring/security/RestAuthenticationProvider.java | 3 ++-
1 files changed, 2 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 b9d6e21..938ffee 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
@@ -25,6 +25,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import java.util.stream.Collectors;
@@ -75,7 +76,7 @@
if (! CollectionUtils.isEmpty(deptIds)) {
deptIds = departmentMapper.getChilds(deptIds); // 鏌ヨ瀛愰儴闂�
// 濡傛灉璇ラ儴闂ㄨ繕琚祴浜堜簡绠＄悊涓夌骇鍗曚綅鐨勭殑鏉冮檺锛屽垯鏌ュ嚭鏉�
- if (deptList.stream().anyMatch(Department::getSpecial)) {
+ if (deptList.stream().anyMatch(dept -> Objects.nonNull(dept.getSpecial()) && dept.getSpecial())) {
List<CascaderDataVO> levelDeptList = departmentMapper.getLevelDeptList(3);
List<Integer> level3DeptIds = levelDeptList.stream().map(CascaderDataVO::getValue).collect(Collectors.toList());
deptIds.addAll(level3DeptIds);
--
Gitblit v1.8.0