diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/permission/PermissionPointTreeNode.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/permission/PermissionPointTreeNode.java index e3f6b053..cb31a7c5 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/permission/PermissionPointTreeNode.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/permission/PermissionPointTreeNode.java @@ -23,6 +23,9 @@ public class PermissionPointTreeNode implements IBaseTree getFeature(){ + return permissionGroup.stream().map(SaasPermissionGroupVO::getFeature).flatMap(List::stream).collect(Collectors.toList()); + } + } diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java index b57c634e..78a66aca 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionPointServiceImpl.java @@ -301,6 +301,7 @@ public class PermissionPointServiceImpl implements PermissionPointService { PermissionPointTreeNode node = new PermissionPointTreeNode(); node.setPermissionPointId(feature.getId()); node.setPermissionName(feature.getFeatureName()); + node.setCode(feature.getFeatureCode()); node.setParentId(feature.getParentId()); node.setTerminal(feature.getTerminal()); node.setFeatureType(feature.getFeatureType());