From d3ce05d7589203887fe312b95343638328dc01af Mon Sep 17 00:00:00 2001
From: ageer <ageerle@163.com>
Date: 星期二, 25 三月 2025 20:32:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
ruoyi-modules/ruoyi-system/src/main/java/org/ruoyi/system/controller/system/SysMenuController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
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 2019aa3..da9365a 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 @@
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 @@
}, mode = SaMode.OR)
@SaCheckPermission("system:menu:query")
@GetMapping("/treeselect")
- public R<List<Tree<Long>>> treeselect(SysMenuBo menu) {
+ public R<MenuTreeSelectVo> treeselect(SysMenuBo menu) {
List<SysMenuVo> 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);
}
/**
--
Gitblit v1.9.3