From f6fb9d0c56bf8e045d46e9782221021d3011ac01 Mon Sep 17 00:00:00 2001 From: Lucky0829 <641787296@qq.com> Date: Tue, 30 Apr 2019 10:26:48 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BC=98=E5=8C=96.=20=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=B8=B8=E9=87=8F=E8=8F=9C=E5=8D=95=E6=A0=91=E6=A0=B9?= =?UTF-8?q?=E8=8A=82=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/common/core/constant/CommonConstants.java | 5 +++++ .../com/pig4cloud/pigx/admin/controller/MenuController.java | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CommonConstants.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CommonConstants.java index 812e942be..e46bb2738 100644 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CommonConstants.java +++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CommonConstants.java @@ -47,6 +47,11 @@ public interface CommonConstants { */ String MENU = "0"; + /** + * 菜单树根节点 + */ + Integer MENU_TREE_ROOT_ID = -1; + /** * 编码 */ diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java index f9ed5f663..6f77cf2f1 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java @@ -68,7 +68,7 @@ public class MenuController { .map(MenuTree::new) .sorted(Comparator.comparingInt(MenuTree::getSort)) .collect(Collectors.toList()); - return new R<>(TreeUtil.build(menuTreeList, -1)); + return new R<>(TreeUtil.build(menuTreeList, CommonConstants.MENU_TREE_ROOT_ID)); } /** @@ -78,7 +78,9 @@ public class MenuController { */ @GetMapping(value = "/tree") public R getTree() { - return new R<>(TreeUtil.buildTree(sysMenuService.list(Wrappers.emptyWrapper()), -1)); + return new R<>(TreeUtil.buildTree(sysMenuService + .list(Wrappers.lambdaQuery() + .orderByAsc(SysMenu::getSort)), CommonConstants.MENU_TREE_ROOT_ID)); } /**