From aa0382e44311f9f7e62a688c8fcaa9c69a512e0f Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期二, 24 十二月 2024 15:15:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/controller/admin/auth/AuthController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/controller/admin/auth/AuthController.java b/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/controller/admin/auth/AuthController.java
index 2de4f9c..2fcd758 100644
--- a/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/controller/admin/auth/AuthController.java
+++ b/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/controller/admin/auth/AuthController.java
@@ -136,7 +136,7 @@
Set<Long> menuIds = permissionService.getRoleMenuListByRoleId(convertSet(roles, RoleDO::getId));
List<MenuDO> menuList = menuService.getMenuList(menuIds);
menuList = menuService.filterDisableMenus(menuList);
-// menuList = menuService.filterMenus(menuList, "system");
+ menuList = menuService.filterMenus(menuList, "system");
// 2. 拼接结果返回
return success(AuthConvert.INSTANCE.convert(user, roles, menuList));
@@ -239,7 +239,7 @@
}
children.retainAll(menuList);
List<MenuDO> tempChildren = new LinkedList<>();
- //为每一个二级菜单增加一个隐藏父级目录
+ //为每一个二级菜单（非外链菜单）增加一个隐藏父级目录
children.stream().forEach(menu -> {
if (menu.getParentId().equals(menuDO.getId())) {
if(menu.getType().equals(MenuTypeEnum.MENU.getType())) {
@@ -253,8 +253,10 @@
menu.setParentId(parentMenu.getId());
tempChildren.add(parentMenu);
} else if(menu.getType().equals(MenuTypeEnum.DIR.getType())) {
- // 为应用菜单二级目录前增加“/”
- menu.setPath("/" + menu.getPath());
+ // 为应用菜单二级目录前增加“/” (不处理外链菜单path)
+ if(!menu.getPath().contains("http:") && !menu.getPath().contains("https:")) {
+ menu.setPath("/" + menu.getPath());
+ }
}
}
tempChildren.add(menu);
--
Gitblit v1.9.3