feat(2227-permissionQuery):修复权限查询
This commit is contained in:
parent
b809351a54
commit
137f8e0d1a
@ -75,8 +75,8 @@ public class PermissionQueryServiceImpl implements PermissionQueryService {
|
||||
|
||||
|
||||
//查询权限
|
||||
//List<PermissionDO> permissions = queryUserPermission(context);
|
||||
List<PermissionDO> permissions = queryAllPermission(context);
|
||||
List<PermissionDO> permissions = queryUserPermission(context);
|
||||
// List<PermissionDO> permissions = queryAllPermission(context);
|
||||
if (CollectionUtil.isEmpty(permissions)) {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
@ -146,8 +146,8 @@ public class PermissionQueryServiceImpl implements PermissionQueryService {
|
||||
.build()
|
||||
.appendPersonId(req.getPersonId());
|
||||
//查询权限
|
||||
// List<PermissionDO> permissions = queryUserPermission(context);
|
||||
List<PermissionDO> permissions = queryAllPermission(context);
|
||||
List<PermissionDO> permissions = queryUserPermission(context);
|
||||
// List<PermissionDO> permissions = queryAllPermission(context);
|
||||
Set<Long> featureIds = permissions.stream().map(PermissionDO::getFeatureIds).flatMap(Set::stream).collect(Collectors.toSet());
|
||||
//权限过滤
|
||||
return resourceList.stream()
|
||||
@ -231,7 +231,7 @@ public class PermissionQueryServiceImpl implements PermissionQueryService {
|
||||
|
||||
result.put(key, permission);
|
||||
}
|
||||
return null;
|
||||
return new ArrayList<>(result.values());
|
||||
}
|
||||
|
||||
private List<Long> buildNormalPermission(RoleWithFeature role, List<WorkspaceFeatureRelation> allFeatures) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user