From 62eb499b0c969f246d3245d1429a97da4de1ce28 Mon Sep 17 00:00:00 2001
From: 钟日健 <arsn163@163.com>
Date: Mon, 01 Jun 2026 20:46:13 +0800
Subject: [PATCH] feat: 成绩查询增加年龄查询返回
---
src/main/java/org/springblade/modules/system/controller/MenuController.java | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/MenuController.java b/src/main/java/org/springblade/modules/system/controller/MenuController.java
index 1046fee..099b042 100644
--- a/src/main/java/org/springblade/modules/system/controller/MenuController.java
+++ b/src/main/java/org/springblade/modules/system/controller/MenuController.java
@@ -25,6 +25,7 @@
import org.springblade.core.launch.constant.AppConstant;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.support.Kv;
@@ -173,8 +174,8 @@
@GetMapping("/routes")
@ApiOperationSupport(order = 8)
@ApiOperation(value = "前端菜单数据", notes = "前端菜单数据")
- public R<List<MenuVO>> routes(BladeUser user, Long topMenuId) {
- List<MenuVO> list = menuService.routes((user == null) ? null : user.getRoleId(), topMenuId);
+ public R<List<MenuVO>> routes(Long topMenuId) {
+ List<MenuVO> list = menuService.routes(AuthUtil.getUser().getRoleId(), topMenuId);
return R.data(list);
}
@@ -184,8 +185,8 @@
@GetMapping("/routes-ext")
@ApiOperationSupport(order = 9)
@ApiOperation(value = "前端菜单数据", notes = "前端菜单数据")
- public R<List<MenuVO>> routesExt(BladeUser user, Long topMenuId) {
- List<MenuVO> list = menuService.routesExt(user.getRoleId(), topMenuId);
+ public R<List<MenuVO>> routesExt(Long topMenuId) {
+ List<MenuVO> list = menuService.routesExt(AuthUtil.getUser().getRoleId(), topMenuId);
return R.data(list);
}
@@ -195,8 +196,8 @@
@GetMapping("/buttons")
@ApiOperationSupport(order = 10)
@ApiOperation(value = "前端按钮数据", notes = "前端按钮数据")
- public R<List<MenuVO>> buttons(BladeUser user) {
- List<MenuVO> list = menuService.buttons(user.getRoleId());
+ public R<List<MenuVO>> buttons() {
+ List<MenuVO> list = menuService.buttons(AuthUtil.getUser().getRoleId());
return R.data(list);
}
@@ -217,7 +218,8 @@
@GetMapping("/grant-tree")
@ApiOperationSupport(order = 12)
@ApiOperation(value = "权限分配树形结构", notes = "权限分配树形结构")
- public R<GrantTreeVO> grantTree(BladeUser user) {
+ public R<GrantTreeVO> grantTree() {
+ BladeUser user = AuthUtil.getUser();
GrantTreeVO vo = new GrantTreeVO();
vo.setMenu(menuService.grantTree(user));
vo.setDataScope(menuService.grantDataScopeTree(user));
@@ -245,7 +247,8 @@
@GetMapping("/grant-top-tree")
@ApiOperationSupport(order = 14)
@ApiOperation(value = "顶部菜单树形结构", notes = "顶部菜单树形结构")
- public R<GrantTreeVO> grantTopTree(BladeUser user) {
+ public R<GrantTreeVO> grantTopTree() {
+ BladeUser user = AuthUtil.getUser();
GrantTreeVO vo = new GrantTreeVO();
vo.setMenu(menuService.grantTopTree(user));
return R.data(vo);
@@ -269,7 +272,8 @@
@GetMapping("/top-menu")
@ApiOperationSupport(order = 16)
@ApiOperation(value = "顶部菜单数据", notes = "顶部菜单数据")
- public R<List<TopMenu>> topMenu(BladeUser user) {
+ public R<List<TopMenu>> topMenu() {
+ BladeUser user = AuthUtil.getUser();
if (Func.isEmpty(user)) {
return null;
}
@@ -283,7 +287,8 @@
@GetMapping("auth-routes")
@ApiOperationSupport(order = 17)
@ApiOperation(value = "菜单的角色权限")
- public R<List<Kv>> authRoutes(BladeUser user) {
+ public R<List<Kv>> authRoutes() {
+ BladeUser user = AuthUtil.getUser();
if (Func.isEmpty(user)) {
return null;
}
--
Gitblit v1.9.3