hy/aslan-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

admin 身份问题处理

Browse Source
This commit is contained in:
tianfeng 2025-11-11 14:26:47 +08:00
parent 4565d58d2f
commit 92ce1b2da0
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/service/user/user/UserIdentityServiceImpl.java
View File

@ -41,11 +41,12 @@ public class UserIdentityServiceImpl implements UserIdentityService {
teamProfileClient.getByMemberId(userId)); teamProfileClient.getByMemberId(userId));
Administrator administrator = administratorService.getByUserId(userId); Administrator administrator = administratorService.getByUserId(userId);
boolean isAdmin = Optional.of(administrator!= null).orElse(Boolean.FALSE); boolean isValidAdmin = administrator != null && Boolean.TRUE.equals(administrator.getStatus());
boolean isSuperAdmin = Optional.ofNullable(administrator)
boolean isSuperAdmin = isValidAdmin && Optional.of(administrator)
.map(e -> RoomRolesEnum.MANAGER.eq(e.getRoles()) || RoomRolesEnum.SUPER_ADMIN.eq(e.getRoles())) .map(e -> RoomRolesEnum.MANAGER.eq(e.getRoles()) || RoomRolesEnum.SUPER_ADMIN.eq(e.getRoles()))
.orElse(Boolean.FALSE); .orElse(Boolean.FALSE);
boolean isManager = Optional.ofNullable(administrator) boolean isManager = isValidAdmin && Optional.of(administrator)
.map(e -> RoomRolesEnum.MANAGER.eq(e.getRoles())) .map(e -> RoomRolesEnum.MANAGER.eq(e.getRoles()))
.orElse(Boolean.FALSE); .orElse(Boolean.FALSE);
@ -56,10 +57,10 @@ public class UserIdentityServiceImpl implements UserIdentityService {
.setFreightAgent(ResponseAssert.requiredSuccess(freightGoldClient.checkFreightAgent(userId))) .setFreightAgent(ResponseAssert.requiredSuccess(freightGoldClient.checkFreightAgent(userId)))
.setSuperFreightAgent(ResponseAssert.requiredSuccess(freightGoldClient.checkSuperFreightAgent(userId))) .setSuperFreightAgent(ResponseAssert.requiredSuccess(freightGoldClient.checkSuperFreightAgent(userId)))
.setSuperAdmin(isSuperAdmin) .setSuperAdmin(isSuperAdmin)
.setAdmin(isAdmin) .setAdmin(isValidAdmin)
.setBdLeader(ResponseAssert.requiredSuccess(bdTeamLeaderClient.check(userId))) .setBdLeader(ResponseAssert.requiredSuccess(bdTeamLeaderClient.check(userId)))
.setManager(isManager) .setManager(isManager)
; ;
} }
@Override @Override