From 355ca8909480f7013567630afc229fe88bd8a188 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期五, 20 十二月 2024 14:48:22 +0800
Subject: [PATCH] 1、部分接口关闭数据权限，避免只查看自己时，查询不到部门 2、外链二级菜单跳转的bug解决，当是外链菜单时，path前不额外增加“/”处理
---
iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/controller/admin/auth/AuthController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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..d2a3342 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())) {
@@ -254,7 +254,9 @@
tempChildren.add(parentMenu);
} else if(menu.getType().equals(MenuTypeEnum.DIR.getType())) {
// 为应用菜单二级目录前增加“/”
- menu.setPath("/" + menu.getPath());
+ if(!menu.getPath().contains("http:") && !menu.getPath().contains("https:")) {
+ menu.setPath("/" + menu.getPath());
+ }
}
}
tempChildren.add(menu);
--
Gitblit v1.9.3