浏览代码

角色菜单为空报错

lyhzzz 3 年之前
父节点
当前提交
a02572f302

+ 1 - 0
src/main/java/com/fdkankan/manage/controller/SysMenuController.java

@@ -61,6 +61,7 @@ public class SysMenuController extends BaseController{
     public ResultData getByUserId(){
         return ResultData.ok(menuService.getByUserId(getUserId()));
     }
+
     @GetMapping("/getByRoleId")
     public ResultData getByRoleId(@RequestParam(required = false) Long roleId){
         return ResultData.ok(menuService.getByRoleId(null,roleId));

+ 3 - 0
src/main/java/com/fdkankan/manage/service/impl/SysMenuServiceImpl.java

@@ -89,6 +89,9 @@ public class SysMenuServiceImpl extends ServiceImpl<ISysMenuMapper, SysMenu> imp
     public List<SysMenuVo> getByRoleId(List<Long> menuIds ,Long roleId) {
         if(menuIds == null){
             List<SysRoleMenu> roleMenus  = roleMenuService.getByRoleId(roleId);
+            if(roleMenus == null || roleMenus.size() <=0){
+                return new ArrayList<>();
+            }
             menuIds = roleMenus.parallelStream().map(SysRoleMenu::getMenuId).collect(Collectors.toList());
         }
         return setTreeMenuVo(true,menuIds);