From e9259901aa1137ab81c309ccc30aaa34e4e6993f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 23 一月 2026 14:25:01 +0800
Subject: [PATCH] 修改bug
---
ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java
index e6a2e73..da6fcff 100644
--- a/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java
+++ b/ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/system/LoginController.java
@@ -133,8 +133,13 @@
roleList.add(0);
}
List<Relation> relations = relationService.selectList(new EntityWrapper<Relation>().in("roleid", roleList));
- Set<Long> collect = relations.stream().map(Relation::getMenuid).collect(Collectors.toSet());
- List<Menu> menuList = menuService.selectBatchIds(collect);
+ if(!relations.isEmpty()){
+ Set<Long> collect = relations.stream().map(Relation::getMenuid).collect(Collectors.toSet());
+ List<Menu> menuList = menuService.selectBatchIds(collect);
+ shiroUser.setMenuIds(menuList.stream().map(Menu::getUrl).collect(Collectors.toList()));
+ }else{
+ shiroUser.setMenuIds(new ArrayList<>());
+ }
List<MenuNode> menus = menuService.getMenusByRoleIds(roleList);
// 根据企业经营范围过滤菜单（在构建树之前过滤）
TCompany tCompany = companyMapper.selectById(shiroUser.getObjectId());
@@ -143,7 +148,6 @@
}
List<MenuNode> titles = MenuNode.buildTitle(menus);
titles = ApiMenuFilter.build(titles);
- shiroUser.setMenuIds(menuList.stream().map(Menu::getUrl).collect(Collectors.toList()));
model.addAttribute("titles", titles);
--
Gitblit v1.7.1