diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/user/user/UserIdentityServiceImpl.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/user/user/UserIdentityServiceImpl.java index 1bec9e15..5c84e4ac 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/user/user/UserIdentityServiceImpl.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/user/user/UserIdentityServiceImpl.java @@ -41,9 +41,7 @@ public class UserIdentityServiceImpl implements UserIdentityService { teamProfileClient.getByMemberId(userId)); Administrator administrator = administratorService.getByUserId(userId); - boolean isAdmin = Optional.ofNullable(administrator) - .map(e -> RoomRolesEnum.ADMIN.eq(e.getRoles())) - .orElse(Boolean.FALSE); + boolean isAdmin = Optional.of(administrator!= null).orElse(Boolean.FALSE); boolean isSuperAdmin = Optional.ofNullable(administrator) .map(e -> RoomRolesEnum.SUPER_ADMIN.eq(e.getRoles())) .orElse(Boolean.FALSE);