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 cab02e059..4bdf85fbd 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 @@ -30,7 +30,7 @@ import java.util.List; /** * @author lengleng - * @date 2017年11月9日23:34:11 + * @date 2020-02-09 */ @UtilityClass public class TreeUtil { @@ -115,6 +115,8 @@ public class TreeUtil { node.setCode(menu.getPermission()); node.setLabel(menu.getName()); node.setIcon(menu.getIcon()); + node.setType(menu.getType()); + node.setSort(menu.getSort()); node.setKeepAlive(menu.getKeepAlive()); trees.add(node); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysMenuController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysMenuController.java index 71612375e..ebcb46bcb 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysMenuController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysMenuController.java @@ -70,7 +70,6 @@ public class SysMenuController { .sorted(Comparator.comparingInt(MenuTree::getSort)) .collect(Collectors.toList()); - return R.ok(TreeUtil.build(menuTreeList, parentId == null ? CommonConstants.MENU_TREE_ROOT_ID : parentId)); }