diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysMenuController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysMenuController.java index 2019aa3d..da9365af 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysMenuController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysMenuController.java @@ -3,7 +3,6 @@ package org.ruoyi.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckRole; import cn.dev33.satoken.annotation.SaMode; -import cn.hutool.core.lang.tree.Tree; import lombok.RequiredArgsConstructor; import org.ruoyi.common.core.constant.TenantConstants; import org.ruoyi.common.core.constant.UserConstants; @@ -86,9 +85,11 @@ public class SysMenuController extends BaseController { }, mode = SaMode.OR) @SaCheckPermission("system:menu:query") @GetMapping("/treeselect") - public R>> treeselect(SysMenuBo menu) { + public R treeselect(SysMenuBo menu) { List menus = menuService.selectMenuList(menu, LoginHelper.getUserId()); - return R.ok(menuService.buildMenuTreeSelect(menus)); + MenuTreeSelectVo selectVo = new MenuTreeSelectVo(); + selectVo.setMenus(menuService.buildMenuTreeSelect(menus)); + return R.ok(selectVo); } /**