hhyykk/RuoYi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改菜单权限显示问题

Browse Source
This commit is contained in:
RuoYi
2019-06-17 13:29:40 +08:00
parent 91dd624048
commit ff67062c7f
7 changed files with 99 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
View File

@ -46,7 +46,8 @@ public class SysMenuController extends BaseController
@ResponseBody
public List<SysMenu> list(SysMenu menu)
{
List<SysMenu> menuList = menuService.selectMenuList(menu);
Long userId = ShiroUtils.getUserId();
List<SysMenu> menuList = menuService.selectMenuList(menu, userId);
return menuList;
}
@ -156,7 +157,8 @@ public class SysMenuController extends BaseController
@ResponseBody
public List<Ztree> roleMenuTreeData(SysRole role)
{
List<Ztree> ztrees = menuService.roleMenuTreeData(role);
Long userId = ShiroUtils.getUserId();
List<Ztree> ztrees = menuService.roleMenuTreeData(role, userId);
return ztrees;
}
@ -165,9 +167,10 @@ public class SysMenuController extends BaseController
*/
@GetMapping("/menuTreeData")
@ResponseBody
public List<Ztree> menuTreeData(SysRole role)
public List<Ztree> menuTreeData()
{
List<Ztree> ztrees = menuService.menuTreeData();
Long userId = ShiroUtils.getUserId();
List<Ztree> ztrees = menuService.menuTreeData(userId);
return ztrees;
}