From 8dab1f5e6ae80f6808d818ba799d38bb0ef4e699 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 28 Dec 2023 20:37:45 +0800
Subject: [PATCH] bug 修复

---
 src/main/java/org/springblade/modules/system/controller/MenuController.java |    6 +++---
 1 files changed, 3 insertions(+), 3 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 f4f9e71..5d5b535 100644
--- a/src/main/java/org/springblade/modules/system/controller/MenuController.java
+++ b/src/main/java/org/springblade/modules/system/controller/MenuController.java
@@ -138,8 +138,8 @@
 	 */
 	@GetMapping("/dynamicMenu")
 	@ApiOperation(value = "菜单列表", notes = "传入menu")
-	public R<List<MenuVO>> dynamicMenu(String roleId, Long topMenuId, @RequestParam(value = "labelType", required = false,defaultValue = "0") Integer labelType) {
-		List<MenuVO> list = menuService.routes(roleId, topMenuId,labelType,1);
+	public R<List<MenuVO>> dynamicMenu(String roleId, Long topMenuId, @RequestParam(value = "labelType", required = false,defaultValue = "0") Integer labelType, @RequestParam(value = "roleName",required = false) String roleName) {
+		List<MenuVO> list = menuService.routes(roleId, topMenuId,labelType,1,roleName);
 		return R.data(list);
 	}
 
@@ -200,7 +200,7 @@
 	@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,null,0);
+		List<MenuVO> list = menuService.routes((user == null) ? null : user.getRoleId(), topMenuId,null,0,"");
 		return R.data(list);
 	}
 

--
Gitblit v1.9.3