From 554beaf6e79707b214fddace4795a87afb1f2c50 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sat, 08 Feb 2020 18:30:09 +0800
Subject: [PATCH] 修改在角色管理页修改菜单权限偶尔未选中问题
---
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java
index d47ff4d..0cb277e 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysMenuController.java
@@ -11,12 +11,14 @@
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.framework.security.LoginUser;
+import com.ruoyi.framework.security.service.TokenService;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.domain.SysMenu;
@@ -34,6 +36,9 @@
@Autowired
private ISysMenuService menuService;
+ @Autowired
+ private TokenService tokenService;
+
/**
* 获取菜单列表
*/
@@ -41,7 +46,9 @@
@GetMapping("/list")
public AjaxResult list(SysMenu menu)
{
- List<SysMenu> menus = menuService.selectMenuList(menu);
+ LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+ Long userId = loginUser.getUser().getUserId();
+ List<SysMenu> menus = menuService.selectMenuList(menu, userId);
return AjaxResult.success(menuService.buildMenuTree(menus));
}
@@ -58,23 +65,27 @@
/**
* 获取菜单下拉树列表
*/
- @PreAuthorize("@ss.hasPermi('system:menu:query')")
@GetMapping("/treeselect")
- public AjaxResult treeselect(SysMenu dept)
+ public AjaxResult treeselect(SysMenu menu)
{
- List<SysMenu> menus = menuService.selectMenuList(dept);
+ LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+ Long userId = loginUser.getUser().getUserId();
+ List<SysMenu> menus = menuService.selectMenuList(menu, userId);
return AjaxResult.success(menuService.buildMenuTreeSelect(menus));
}
/**
* 加载对应角色菜单列表树
*/
- @PreAuthorize("@ss.hasPermi('system:menu:query')")
@GetMapping(value = "/roleMenuTreeselect/{roleId}")
- @ResponseBody
public AjaxResult roleMenuTreeselect(@PathVariable("roleId") Long roleId)
{
- return AjaxResult.success(menuService.selectMenuListByRoleId(roleId));
+ LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+ List<SysMenu> menus = menuService.selectMenuList(loginUser.getUser().getUserId());
+ AjaxResult ajax = AjaxResult.success();
+ ajax.put("checkedKeys", menuService.selectMenuListByRoleId(roleId));
+ ajax.put("menus", menuService.buildMenuTreeSelect(menus));
+ return ajax;
}
/**
@@ -83,7 +94,7 @@
@PreAuthorize("@ss.hasPermi('system:menu:add')")
@Log(title = "菜单管理", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult add(@RequestBody @Validated SysMenu menu)
+ public AjaxResult add(@Validated @RequestBody SysMenu menu)
{
if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
{
@@ -99,7 +110,7 @@
@PreAuthorize("@ss.hasPermi('system:menu:edit')")
@Log(title = "菜单管理", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult edit(@RequestBody SysMenu menu)
+ public AjaxResult edit(@Validated @RequestBody SysMenu menu)
{
if (UserConstants.NOT_UNIQUE.equals(menuService.checkMenuNameUnique(menu)))
{
--
Gitblit v1.9.2