wangli/tyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

获取分组权限点 bugfix

Browse Source
This commit is contained in:
yangsong 2023-09-18 15:34:38 +08:00
parent a1d60a09a6
commit 0eeb386924
1 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionGroupImpl.java
View File

@ -123,11 +123,15 @@ public class PermissionGroupImpl implements PermissionGroupService {
.in(SaasPgroupPermissionRelation::getGroupId, groupIds) .in(SaasPgroupPermissionRelation::getGroupId, groupIds)
.eq(BaseEntity::getIsDelete, TableIsDeleteEnum.NORMAL.value) .eq(BaseEntity::getIsDelete, TableIsDeleteEnum.NORMAL.value)
.list(); .list();
List<PermissionPointTreeNode> feature = new ArrayList<>(); List<PermissionPointTreeNode> features = new ArrayList<>();
if (CollectionUtils.isNotEmpty(permissionList)) { if (CollectionUtils.isNotEmpty(permissionList)) {
// 查询featureCode // 查询全部featureCode
feature = featureService.listNodesByIds(permissionList.stream().map(SaasPgroupPermissionRelation::getFeatureId).collect(Collectors.toList())); features = featureService.listNodesByIds(permissionList.stream().map(SaasPgroupPermissionRelation::getFeatureId).collect(Collectors.toList()));
} }
Map<Long, PermissionPointTreeNode> featureMap = features.stream().collect(Collectors.toMap(PermissionPointTreeNode::getPermissionPointId, Function.identity(), (e1, e2) -> e2));
Map<Long, List<PermissionPointTreeNode>> pgroupPermissionMap = permissionList.stream()
.collect(Collectors.groupingBy(SaasPgroupPermissionRelation::getGroupId,
Collectors.mapping(releation -> featureMap.get(releation.getFeatureId()), Collectors.toList())));
List<SaasPermissionGroupScope> saasPermissionGroupScopesSource = saasPermissionGroupScopeDao.lambdaQuery() List<SaasPermissionGroupScope> saasPermissionGroupScopesSource = saasPermissionGroupScopeDao.lambdaQuery()
.in(SaasPermissionGroupScope::getPgroupId, groupIds) .in(SaasPermissionGroupScope::getPgroupId, groupIds)
.eq(BaseEntity::getIsDelete, TableIsDeleteEnum.NORMAL.value) .eq(BaseEntity::getIsDelete, TableIsDeleteEnum.NORMAL.value)
@ -149,24 +153,26 @@ public class PermissionGroupImpl implements PermissionGroupService {
} }
return true; return true;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
Map<Long, List<SaasRolePermissionScopeVO>> permissionGroupScopeMap = saasPermissionGroupScopes.stream().collect(Collectors.groupingBy(SaasPermissionGroupScope::getPgroupId, Collectors.mapping(e -> BeanMapper.copyBean(e, SaasRolePermissionScopeVO.class), Collectors.toList())));
// 组装填充字段 // 组装填充字段
List<PermissionPointTreeNode> finalFeature = feature; List<SaasPermissionGroupVO> pageList = groupList.stream().map(group -> {
List<SaasPermissionGroupVO> pageList = groupList.stream().map(group -> SaasPermissionGroupVO pgroupResult = SaasPermissionGroupVO.builder()
SaasPermissionGroupVO.builder() .id(group.getId())
.id(group.getId()) .name(group.getName())
.name(group.getName()) .scopes(Optional.ofNullable(permissionGroupScopeMap.get(group.getId())).orElse(new ArrayList<>()))
.feature(finalFeature) .feature(Optional.ofNullable(pgroupPermissionMap.get(group.getId())).orElse(new ArrayList<>()))
.scopes(saasPermissionGroupScopes.stream().filter(e -> e.getPgroupId().equals(group.getId())).map(e -> BeanMapper.copyBean(e, SaasRolePermissionScopeVO.class)).collect(Collectors.toList())) .createBy(group.getCreateBy())
.createBy(group.getCreateBy()) .creatorName(group.getCreatorName())
.creatorName(group.getCreatorName()) .updateBy(group.getUpdateBy())
.updateBy(group.getUpdateBy()) .updatorName(group.getUpdatorName())
.updatorName(group.getUpdatorName()) .roleId(Optional.ofNullable(pgrrMap.get(group.getId())).map(SaasPgroupRoleRelation::getRoleId).orElse(null))
.roleId(Optional.ofNullable(pgrrMap.get(group.getId())).map(SaasPgroupRoleRelation::getRoleId).orElse(null)) .type(group.getType())
.type(group.getType()) .isCommon(group.getIsCommon())
.isCommon(group.getIsCommon()) .createAt(group.getCreateAt())
.createAt(group.getCreateAt()) .updateAt(group.getUpdateAt())
.updateAt(group.getUpdateAt()) .build();
.build() return pgroupResult;
}
).collect(Collectors.toList()); ).collect(Collectors.toList());
return PageResp.list(iPage.getCurrent(), iPage.getSize(), iPage.getTotal(), pageList); return PageResp.list(iPage.getCurrent(), iPage.getSize(), iPage.getTotal(), pageList);
} }