guoshilong
2023-04-25 35c9dae7372048f22208d70a8cefa91d6f7ee081
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);