From 4e372402fc814645e1808cd8c0e623c900d5f728 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Mon, 05 Jun 2023 21:29:37 +0800
Subject: [PATCH] 增加新菜单配置
---
skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/MenuController.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/MenuController.java b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/MenuController.java
index 41d9c49..1409571 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/MenuController.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/MenuController.java
@@ -16,8 +16,7 @@
*/
package cn.gistack.system.controller;
-import cn.gistack.system.vo.GrantTreeVO;
-import cn.gistack.system.vo.WebMenuVO;
+import cn.gistack.system.vo.*;
import cn.gistack.system.wrapper.MenuWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -38,8 +37,6 @@
import cn.gistack.system.entity.TopMenu;
import cn.gistack.system.service.IMenuService;
import cn.gistack.system.service.ITopMenuService;
-import cn.gistack.system.vo.CheckedTreeVO;
-import cn.gistack.system.vo.MenuVO;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
@@ -194,7 +191,11 @@
public R dynamicMenu(String roleId,String flag){
if (flag.equals("web")){
List<WebMenuVO> list = menuService.getWebMenu(roleId);
- return R.data(list);
+ List<MenuVO> buttonList = menuService.getButtonList(roleId);
+ WebPermissionVO webPermissionVO = new WebPermissionVO();
+ webPermissionVO.setButtonList(buttonList);
+ webPermissionVO.setWebMenuList(list);
+ return R.data(webPermissionVO);
}
if (flag.equals("app")){
List<MenuVO> list = menuService.getAppMenu(roleId);
--
Gitblit v1.9.3