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 cb31a7c5..e8b71ffc 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 @@ -1,6 +1,8 @@ package cn.axzo.tyr.client.model.permission; import cn.axzo.basics.common.model.IBaseTree; +import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.util.List; @@ -51,21 +53,25 @@ public class PermissionPointTreeNode implements IBaseTree children; + @JsonIgnore @Override public Long getNodeCode() { return permissionPointId; } + @JsonIgnore @Override public Long getParentNodeCode() { return parentId; } + @JsonIgnore @Override public List getNodeChildren() { return children; } + @JsonIgnore @Override public void setNodeChildren(List nodeChildren) { this.children = nodeChildren; 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 491f4a38..d498cfe8 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 @@ -96,7 +96,7 @@ public class PermissionPointServiceImpl implements PermissionPointService { .collect(Collectors.groupingBy(PermissionPointTreeNode::getTerminal)); //构建workspace-terminal工作台层级 List dictList = saasBasicDictService.getBasicDictNodeTree(DictTypeFiledEnum.TERMINAL).getData(); - //遍历所有workspace和terminal + //遍历所有workspace和terminal-构建顶层两级 List result = new ArrayList<>(); for (BasicDictTreeResp workspace : dictList) { List terminals = workspace.getChildren(); @@ -122,8 +122,6 @@ public class PermissionPointServiceImpl implements PermissionPointService { result.add(workspaceNode); } } - - return result; }