From ded964bb1ebe6cd843c57d433badbbe4ecc9df96 Mon Sep 17 00:00:00 2001
From: wangyu <727842003@qq.com>
Date: Tue, 19 Mar 2024 10:57:48 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A7=A3=E5=86=B3npe?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../config/encrypt/AESEncryptablePropertyResolver.java   | 3 ++-
 .../java/com/flyfish/framework/service/UserService.java  | 9 ++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/flyfish-data/src/main/java/com/flyfish/framework/config/encrypt/AESEncryptablePropertyResolver.java b/flyfish-data/src/main/java/com/flyfish/framework/config/encrypt/AESEncryptablePropertyResolver.java
index 4430e65..ddbae70 100644
--- a/flyfish-data/src/main/java/com/flyfish/framework/config/encrypt/AESEncryptablePropertyResolver.java
+++ b/flyfish-data/src/main/java/com/flyfish/framework/config/encrypt/AESEncryptablePropertyResolver.java
@@ -38,8 +38,9 @@ public class AESEncryptablePropertyResolver implements EncryptablePropertyResolv
     }
 
     public static void main(String[] args) {
+        String test = "$-dcfe1dbfdf51e1b007c68c6c0b7008c774ed7c05d8aca2797562159ac1098bcc5a9fdcb42e6acb6562944c21969d34a2";
         AESEncryptablePropertyResolver resolver = new AESEncryptablePropertyResolver("sxu-service-2020");
-        String value = resolver.resolvePropertyValue("$-dcfe1dbfdf51e1b007c68c6c0b7008c774ed7c05d8aca2797562159ac1098bcc5a9fdcb42e6acb6562944c21969d34a2");
+        String value = resolver.resolvePropertyValue(test);
         System.out.println(value);
     }
 }
diff --git a/flyfish-user/src/main/java/com/flyfish/framework/service/UserService.java b/flyfish-user/src/main/java/com/flyfish/framework/service/UserService.java
index 7478989..e16c1bb 100644
--- a/flyfish-user/src/main/java/com/flyfish/framework/service/UserService.java
+++ b/flyfish-user/src/main/java/com/flyfish/framework/service/UserService.java
@@ -13,6 +13,8 @@ import org.springframework.stereotype.Service;
 import reactor.core.publisher.Mono;
 
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Set;
 
 /**
  * 异步用户service
@@ -46,7 +48,12 @@ public class UserService extends BaseReactiveServiceImpl<User> implements UserFi
             AuthorizedUserDetails userDetails = (AuthorizedUserDetails) query.getUser();
             UserQo qo = (UserQo) query;
             if (CollectionUtils.isEmpty(qo.getDepartments())) {
-                qo.setDepartments(new ArrayList<>(userDetails.getVisibleDeparts()));
+                Set<String> visibleDeparts = userDetails.getVisibleDeparts();
+                if (CollectionUtils.isNotEmpty(visibleDeparts)) {
+                    qo.setDepartments(new ArrayList<>(visibleDeparts));
+                } else {
+                    qo.setDepartments(Collections.emptyList());
+                }
             }
         }
         return super.getPageList(query);