diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/MenuController.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/MenuController.java index 9b9ea180..210a6363 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/MenuController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/MenuController.java @@ -15,6 +15,7 @@ */ package me.zhengjie.modules.system.rest; +import cn.hutool.core.collection.CollectionUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -86,13 +87,16 @@ public class MenuController { @ApiOperation("查询菜单:根据ID获取同级与上级数据") @GetMapping("/superior") @PreAuthorize("@el.check('menu:list')") - public ResponseEntity getSuperior(@RequestParam List ids) { + public ResponseEntity getSuperior(@RequestParam(required = false) List ids) { Set menuDtos = new LinkedHashSet<>(); - for (Long id : ids) { - MenuDto menuDto = menuService.findById(id); - menuDtos.addAll(menuService.getSuperior(menuDto, new ArrayList<>())); + if(CollectionUtil.isNotEmpty(ids)){ + for (Long id : ids) { + MenuDto menuDto = menuService.findById(id); + menuDtos.addAll(menuService.getSuperior(menuDto, new ArrayList<>())); + } + return new ResponseEntity<>(menuService.buildTree(new ArrayList<>(menuDtos)),HttpStatus.OK); } - return new ResponseEntity<>(menuService.buildTree(new ArrayList<>(menuDtos)),HttpStatus.OK); + return new ResponseEntity<>(menuService.getMenus(null),HttpStatus.OK); } @Log("新增菜单") diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java index 8108bbd4..d5c0919c 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/RoleServiceImpl.java @@ -164,7 +164,7 @@ public class RoleServiceImpl implements RoleService { } @Override - @Cacheable(key = "'auth:' + #p0") + @Cacheable(key = "'auth:' + #p0.id") public List mapToGrantedAuthorities(UserDto user) { Set permissions = new HashSet<>(); // 如果是管理员直接返回