diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleUserRelationServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleUserRelationServiceImpl.java index 50e9da35..41988118 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleUserRelationServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasRoleUserRelationServiceImpl.java @@ -218,7 +218,8 @@ public class SaasRoleUserRelationServiceImpl extends ServiceImpl roles = checkRoleCode(param); // 查询用户的历史记录 - Map> roleUserMap = listRoleUserRelation(param).stream() + List oldRoleUsers = listRoleUserRelation(param); + Map> roleUserMap = oldRoleUsers.stream() .collect(Collectors.groupingBy(e -> e.getIdentityId() + "_" + e.getIdentityType() + "_" + e.getSaasRoleUser().getPersonId() + "_" + e.getWorkspaceId() + "_" + e.getOuId())); // 根据入参解析insert、delete的记录 @@ -272,7 +273,8 @@ public class SaasRoleUserRelationServiceImpl extends ServiceImpl> roleUserMap, - UpsertUserRoleReq param, - Map roles, - List upsert) { + UpsertUserRoleReq param, + Map roles, + List upsert) { List resultByRemoveRoles = param.getUserRoles().stream() .flatMap(e -> { Set allRemoveRoleIds = Optional.ofNullable(e.getRemoveRoleIds())