flyfish-group/flyfish-framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 解决npe

Browse Source
This commit is contained in:
wangyu 2024-03-19 10:57:48 +08:00
parent 119e9b67e9
commit ded964bb1e
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
flyfish-data/src/main/java/com/flyfish/framework/config/encrypt/AESEncryptablePropertyResolver.java
View File

@ -38,8 +38,9 @@ public class AESEncryptablePropertyResolver implements EncryptablePropertyResolv
} }
public static void main(String[] args) { public static void main(String[] args) {
String test = "$-dcfe1dbfdf51e1b007c68c6c0b7008c774ed7c05d8aca2797562159ac1098bcc5a9fdcb42e6acb6562944c21969d34a2";
AESEncryptablePropertyResolver resolver = new AESEncryptablePropertyResolver("sxu-service-2020"); AESEncryptablePropertyResolver resolver = new AESEncryptablePropertyResolver("sxu-service-2020");
String value = resolver.resolvePropertyValue("$-dcfe1dbfdf51e1b007c68c6c0b7008c774ed7c05d8aca2797562159ac1098bcc5a9fdcb42e6acb6562944c21969d34a2"); String value = resolver.resolvePropertyValue(test);
System.out.println(value); System.out.println(value);
} }
} }

9
flyfish-user/src/main/java/com/flyfish/framework/service/UserService.java
View File

@ -13,6 +13,8 @@ import org.springframework.stereotype.Service;
import reactor.core.publisher.Mono; import reactor.core.publisher.Mono;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.Set;
/** /**
* 异步用户service * 异步用户service
@ -46,7 +48,12 @@ public class UserService extends BaseReactiveServiceImpl<User> implements UserFi
AuthorizedUserDetails userDetails = (AuthorizedUserDetails) query.getUser(); AuthorizedUserDetails userDetails = (AuthorizedUserDetails) query.getUser();
UserQo qo = (UserQo) query; UserQo qo = (UserQo) query;
if (CollectionUtils.isEmpty(qo.getDepartments())) { 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); return super.getPageList(query);