配置调整

zhongrj

2024-05-29 a5fac95408a43ad43de9d88c30d06c0918c7bc8f

 src/main/java/org/springblade/modules/system/controller/MenuController.java

@@ -138,8 +138,11 @@
    */
   @GetMapping("/dynamicMenu")
   @ApiOperation(value = "菜单列表", notes = "传入menu")
   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);
   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,
                              @RequestParam(value = "houseCode",required = false) String houseCode) {
      List<MenuVO> list = menuService.routes(roleId, topMenuId,labelType,1,roleName,houseCode);
      return R.data(list);
   }

@@ -200,7 +203,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);
   }