From a67550857acb79f12b917ca43e95ed14002dd971 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Mon, 17 Feb 2020 20:28:52 +0800 Subject: [PATCH] =?UTF-8?q?:recycle:=20Refactoring=20code.=20=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E7=AE=A1=E7=90=86=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/pig4cloud/pigx/admin/api/dto/MenuTree.java | 9 ++++++++- .../java/com/pig4cloud/pigx/admin/api/vo/TreeUtil.java | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/MenuTree.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/MenuTree.java index 9a1504e72..b496a5887 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/MenuTree.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/dto/MenuTree.java @@ -25,6 +25,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; + /** * @author lengleng * @date 2017年11月9日23:33:27 @@ -32,7 +34,7 @@ import lombok.EqualsAndHashCode; @Data @ApiModel(value = "菜单树") @EqualsAndHashCode(callSuper = true) -public class MenuTree extends TreeNode { +public class MenuTree extends TreeNode implements Serializable { /** * 菜单图标 */ @@ -75,6 +77,11 @@ public class MenuTree extends TreeNode { @ApiModelProperty(value = "排序值") private Integer sort; + /** + * 是否包含子节点 + * @since 3.7 + */ + private Boolean hasChildren; public MenuTree() { } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/TreeUtil.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/TreeUtil.java index 4bdf85fbd..60e46bb27 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/TreeUtil.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/vo/TreeUtil.java @@ -117,6 +117,7 @@ public class TreeUtil { node.setIcon(menu.getIcon()); node.setType(menu.getType()); node.setSort(menu.getSort()); + node.setHasChildren(true); node.setKeepAlive(menu.getKeepAlive()); trees.add(node); }