From 0eb4d8d77b0bbd4b72a6bca2deafff11e08164fd Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 14 Apr 2023 10:44:19 +0800
Subject: [PATCH] web菜单权限控制，menu-app新增字段菜单选中时的图片路径
---
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 50cb047..41d9c49 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
@@ -17,6 +17,7 @@
package cn.gistack.system.controller;
import cn.gistack.system.vo.GrantTreeVO;
+import cn.gistack.system.vo.WebMenuVO;
import cn.gistack.system.wrapper.MenuWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -191,15 +192,15 @@
@ApiOperationSupport(order = 8)
@ApiOperation(value = "动态获取菜单数据", notes = "动态获取菜单数据")
public R dynamicMenu(String roleId,String flag){
- List<MenuVO> list = new ArrayList<>();
if (flag.equals("web")){
- list = menuService.getWebMenu(roleId);
+ List<WebMenuVO> list = menuService.getWebMenu(roleId);
+ return R.data(list);
}
-
if (flag.equals("app")){
- list = menuService.getAppMenu(roleId);
+ List<MenuVO> list = menuService.getAppMenu(roleId);
+ return R.data(list);
}
- return R.data(list);
+ return R.data(null);
}
/**
--
Gitblit v1.9.3