Merge branch 'feature/REQ-1502' into dev

This commit is contained in:
金海洋 2023-10-26 10:40:23 +08:00
commit 35fa4afbc2

View File

@ -590,7 +590,7 @@ public class TyrSaasAuthServiceImpl implements TyrSaasAuthService {
//查询角色及权限
List<SaasRoleVO> rolePermissions = roleService.getByIds(roleList.stream().map(SaasRole::getId).collect(Collectors.toList()),
null, Lists.newArrayList(workspaceId), Collections.singletonList(ouId), true);
null, Lists.newArrayList(workspaceId), Lists.newArrayList(ouId), true);
//计算角色实际的权限 - 匹配请求的权限 --> 实际拥有权限的角色
Set<Long> featureIds = features.stream().map(SaasFeature::getId).collect(Collectors.toSet());