From 9f22f3e9997a679f062a359be540c071d9d04662 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Sun, 9 Feb 2020 21:17:43 +0800 Subject: [PATCH] =?UTF-8?q?=20#743=20=E3=80=90=E9=87=8D=E6=9E=84=E3=80=91M?= =?UTF-8?q?apper=20=E5=8E=BB=E6=8E=89@MapperScan=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=EF=BC=8C=E6=89=8B=E5=8A=A8=E5=A2=9E=E5=8A=A0@Mapper=20?= =?UTF-8?q?=E6=96=B0=E7=89=B9=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/pig4cloud/pigx/admin/api/vo/TreeUtil.java | 4 +++- .../pig4cloud/pigx/admin/controller/SysMenuController.java | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) 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)); }