diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java index 8d82008c..85eb749c 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleUserService.java @@ -437,10 +437,12 @@ public class RoleUserService implements SaasRoleUserService { Long autoOwnRoleId = null; if (CollectionUtils.isNotEmpty(existsRoleUser)) { List autoOwnRoles = existsRoleUser.stream().filter(e -> role.getId().equals(e.getRoleId())).mapToLong(SaasRoleUserRelation::getRoleId).boxed().collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(autoOwnRoles) && autoOwnRoles.size() > 1) { - log.warn("personId:{} ouId:{} workspaceId:{} has {} auto_own roles", req.getPersonId(), req.getOuId(), req.getWorkspaceId(), autoOwnRoles.size()); + if (CollectionUtils.isNotEmpty(autoOwnRoles)) { + autoOwnRoleId = autoOwnRoles.get(0); + if (autoOwnRoles.size() > 1) { + log.warn("personId:{} ouId:{} workspaceId:{} has {} auto_own roles", req.getPersonId(), req.getOuId(), req.getWorkspaceId(), autoOwnRoles.size()); + } } - autoOwnRoleId = autoOwnRoles.get(0); } if (Objects.isNull(autoOwnRoleId)) {