From 308623e6d4679a6c0a589027a94ecb4be3bfaa4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=98=86=E9=B9=8F?= Date: Mon, 8 Apr 2024 16:26:32 +0800 Subject: [PATCH] =?UTF-8?q?feat(2227-=E9=80=9A=E8=AE=AF=E5=BD=95):=20modif?= =?UTF-8?q?y=E4=BF=9D=E5=AD=98=E6=88=96=E6=9B=B4=E6=96=B0=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=9D=83=E9=99=90=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/axzo/tyr/server/service/impl/RoleUserService.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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)) {