diff --git a/src/main/java/com/xujie/sys/modules/sys/controller/SysMenuController.java b/src/main/java/com/xujie/sys/modules/sys/controller/SysMenuController.java index 6df8a89a..4d2bcc89 100644 --- a/src/main/java/com/xujie/sys/modules/sys/controller/SysMenuController.java +++ b/src/main/java/com/xujie/sys/modules/sys/controller/SysMenuController.java @@ -1,4 +1,4 @@ - + package com.xujie.sys.modules.sys.controller; @@ -24,7 +24,7 @@ import java.util.Set; /** * 系统菜单 * - * + * */ @RestController @RequestMapping("/sys/menu") @@ -38,6 +38,7 @@ public class SysMenuController extends AbstractController { /** * 导航菜单 + * 11 */ @GetMapping("/nav") public R nav(@RequestParam("l") String l, @RequestParam("menuType") String menuType){ @@ -45,7 +46,7 @@ public class SysMenuController extends AbstractController { Set permissions = shiroService.getUserPermissions(getUserId()); return R.ok().put("menuList", menuList).put("permissions", permissions); } - + /** * 所有菜单列表 */ @@ -82,7 +83,7 @@ public class SysMenuController extends AbstractController { return menuList; } - + /** * 选择菜单(添加、修改菜单) */ @@ -91,7 +92,7 @@ public class SysMenuController extends AbstractController { public R select(){ //查询列表数据 List menuList = sysMenuService.queryNotButtonList(); - + //添加顶级菜单 SysMenuEntity root = new SysMenuEntity(); root.setMenuId("0"); @@ -99,10 +100,10 @@ public class SysMenuController extends AbstractController { root.setParentId("-1"); root.setOpen(true); menuList.add(root); - + return R.ok().put("menuList", menuList); } - + /** * 菜单信息 */ @@ -112,7 +113,7 @@ public class SysMenuController extends AbstractController { SysMenuEntity menu = sysMenuService.getById(menuId); return R.ok().put("menu", menu); } - + /** * 保存 */ @@ -134,7 +135,7 @@ public class SysMenuController extends AbstractController { // sysObjectLanguageMenuService.saveSysObjectLanguageMenu(sysObjectLanguageMenu); return R.ok(); } - + /** * 修改 */ @@ -145,10 +146,10 @@ public class SysMenuController extends AbstractController { //数据校验 verifyForm(menu); sysMenuService.updateById(menu); - + return R.ok(); } - + /** * 删除 */ @@ -170,7 +171,7 @@ public class SysMenuController extends AbstractController { return R.ok(); } - + /** * 验证参数是否正确 */ @@ -178,25 +179,25 @@ public class SysMenuController extends AbstractController { if(StringUtils.isBlank(menu.getName())){ throw new XJException("菜单名称不能为空"); } - + if(menu.getParentId() == null){ throw new XJException("上级菜单不能为空"); } - + //菜单 if(menu.getType() == Constant.MenuType.MENU.getValue()){ if(StringUtils.isBlank(menu.getUrl())){ throw new XJException("菜单URL不能为空"); } } - + //上级菜单类型 int parentType = Constant.MenuType.CATALOG.getValue(); if(!"0".equals(menu.getParentId())){ SysMenuEntity parentMenu = sysMenuService.getById(menu.getParentId()); parentType = parentMenu.getType(); } - + //目录、菜单 if(menu.getType() == Constant.MenuType.CATALOG.getValue() || menu.getType() == Constant.MenuType.MENU.getValue()){ @@ -205,7 +206,7 @@ public class SysMenuController extends AbstractController { } return ; } - + //按钮 if(menu.getType() == Constant.MenuType.BUTTON.getValue()){ if(parentType != Constant.MenuType.MENU.getValue()){