From 8695c2a66b102fda009c942b23e4d5ac54a90263 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 04 七月 2024 18:23:14 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/AuthController.java | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/AuthController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/AuthController.java
index 2a04143..bdb6fd1 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/AuthController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/AuthController.java
@@ -75,7 +75,21 @@
@GetMapping("/auth/menu")
public R userMenu() {
- List<Menu> menus = roleMenuService.listMenuByUserId(getLoginUserId(), Menu.TYPE_MENU, getHostId());
+ boolean superRole = false;//瓒呯骇绠＄悊鍛�
+ User loginUser = getLoginUser();
+ List<Role> roles = userRoleService.listByUserId(loginUser.getId());
+ for (Role role : roles) {
+ if (role.getId() == 1) {
+ superRole = true;
+ }
+ }
+
+ List<Menu> menus = null;
+ if (superRole) {
+ menus = roleMenuService.listMenuByUserId(null, Menu.TYPE_MENU, getHostId());
+ }else {
+ menus = roleMenuService.listMenuByUserId(getLoginUserId(), Menu.TYPE_MENU, getHostId());
+ }
return R.ok().add(Utils.toTreeData(menus, 0L, Menu::getParentId, Menu::getId, Menu::setChildren));
}
@@ -129,25 +143,38 @@
public R router() {
List<UserRole> userRoles = userRoleService.list(new LambdaQueryWrapper<UserRole>().eq(UserRole::getUserId, getLoginUserId()));
if (userRoles.isEmpty()) {
- return R.error();
+ return R.error("璇峰厛鍒嗛厤瑙掕壊");
}
+
+ boolean superRole = false;//瓒呯骇绠＄悊鍛�
ArrayList<Long> roles = new ArrayList<>();
for (UserRole userRole : userRoles) {
roles.add(userRole.getRoleId());
+ if (userRole.getRoleId() == 1) {
+ superRole = true;
+ }
}
ArrayList<Long> menus = new ArrayList<>();
- List<RoleMenu> roleMenus = roleMenuService.list(new LambdaQueryWrapper<RoleMenu>().in(RoleMenu::getRoleId, roles));
- for (RoleMenu roleMenu : roleMenus) {
- if(!menus.contains(roleMenu.getMenuId())) {
- menus.add(roleMenu.getMenuId());
+ if(superRole) {
+ List<Menu> allMenus = menuService.selectByHostId(getHostId());
+ for (Menu menu : allMenus) {
+ if(!menus.contains(menu.getId())) {
+ menus.add(menu.getId());
+ }
+ }
+ }else {
+ List<RoleMenu> roleMenus = roleMenuService.list(new LambdaQueryWrapper<RoleMenu>().in(RoleMenu::getRoleId, roles));
+ for (RoleMenu roleMenu : roleMenus) {
+ if(!menus.contains(roleMenu.getMenuId())) {
+ menus.add(roleMenu.getMenuId());
+ }
}
}
List<Menu> menuList = menuService.list(new LambdaQueryWrapper<Menu>()
.in(Menu::getId, menus)
.eq(Menu::getType, Menu.TYPE_MENU)
- .eq(Menu::getPath, 1)
.orderByAsc(Menu::getId));
return R.ok().add(menuList);
--
Gitblit v1.9.1