forgetest5
/
ifffff
mirror of https://gitee.com/maxjhandsome/pig
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of https://gitee.com/shepf/pig into dev

This commit is contained in:
冷冷 2020-09-28 08:21:30 +08:00
parent f8b4ad79f4 75e992312a
commit 3b800f54d4
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/dto/MenuTree.java
View File

@ -107,6 +107,7 @@ public class MenuTree extends TreeNode implements Serializable {
this.label = menuVo.getName(); this.label = menuVo.getName();
this.sort = menuVo.getSort(); this.sort = menuVo.getSort();
this.keepAlive = menuVo.getKeepAlive(); this.keepAlive = menuVo.getKeepAlive();
this.hasChildren = false;
} }
} }

2
pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/dto/TreeNode.java
View File

@ -41,6 +41,8 @@ public class TreeNode {
protected List<TreeNode> children = new ArrayList<TreeNode>(); protected List<TreeNode> children = new ArrayList<TreeNode>();
protected Boolean hasChildren;
public void add(TreeNode node) { public void add(TreeNode node) {
children.add(node); children.add(node);
} }

3
pig-upms/pig-upms-api/src/main/java/com/pig4cloud/pig/admin/api/vo/TreeUtil.java
View File

@ -59,6 +59,7 @@ public class TreeUtil {
treeNode.setChildren(new ArrayList<>()); treeNode.setChildren(new ArrayList<>());
} }
treeNode.add(it); treeNode.add(it);
treeNode.setHasChildren(true);
} }
} }
} }
@ -117,7 +118,7 @@ public class TreeUtil {
node.setIcon(menu.getIcon()); node.setIcon(menu.getIcon());
node.setType(menu.getType()); node.setType(menu.getType());
node.setSort(menu.getSort()); node.setSort(menu.getSort());
node.setHasChildren(true); node.setHasChildren(false);
node.setKeepAlive(menu.getKeepAlive()); node.setKeepAlive(menu.getKeepAlive());
trees.add(node); trees.add(node);
} }