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

20
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
View File

@ -17,14 +17,22 @@ public interface SysMenuMapper
* @return 菜单列表
*/
public List<SysMenu> selectMenuAll();
/**
* 根据用户ID查询菜单
*
* @param userId 用户ID
* @return 菜单列表
*/
public List<SysMenu> selectMenuAllByUserId(Long userId);
/**
* 查询系统正常显示菜单（不含按钮）
*
* @return 菜单列表
*/
public List<SysMenu> selectMenuNormalAll();
/**
* 根据用户ID查询菜单
*
@ -57,6 +65,14 @@ public interface SysMenuMapper
*/
public List<SysMenu> selectMenuList(SysMenu menu);
/**
* 查询系统菜单列表
*
* @param menu 菜单信息
* @return 菜单列表
*/
public List<SysMenu> selectMenuListByUserId(SysMenu menu);
/**
* 删除菜单管理信息
*

15
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java
View File

@ -27,16 +27,18 @@ public interface ISysMenuService
* 查询系统菜单列表
*
* @param menu 菜单信息
* @param userId 用户ID
* @return 菜单列表
*/
public List<SysMenu> selectMenuList(SysMenu menu);
public List<SysMenu> selectMenuList(SysMenu menu, Long userId);
/**
* 查询菜单集合
*
* @param userId 用户ID
* @return 所有菜单信息
*/
public List<SysMenu> selectMenuAll();
public List<SysMenu> selectMenuAll(Long userId);
/**
* 根据用户ID查询权限
@ -50,23 +52,26 @@ public interface ISysMenuService
* 根据角色ID查询菜单
*
* @param role 角色对象
* @param userId 用户ID
* @return 菜单列表
*/
public List<Ztree> roleMenuTreeData(SysRole role);
public List<Ztree> roleMenuTreeData(SysRole role, Long userId);
/**
* 查询所有菜单信息
*
* @param userId 用户ID
* @return 菜单列表
*/
public List<Ztree> menuTreeData();
public List<Ztree> menuTreeData(Long userId);
/**
* 查询系统所有权限
*
* @param userId 用户ID
* @return 权限列表
*/
public Map<String, String> selectPermsAll();
public Map<String, String> selectPermsAll(Long userId);
/**
* 删除菜单管理信息

39
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
View File

@ -65,9 +65,19 @@ public class SysMenuServiceImpl implements ISysMenuService
* @return 所有菜单信息
*/
@Override
public List<SysMenu> selectMenuList(SysMenu menu)
public List<SysMenu> selectMenuList(SysMenu menu, Long userId)
{
return menuMapper.selectMenuList(menu);
List<SysMenu> menuList = null;
if (SysUser.isAdmin(userId))
{
menuList = menuMapper.selectMenuList(menu);
}
else
{
menu.getParams().put("userId", userId);
menuList = menuMapper.selectMenuListByUserId(menu);
}
return menuList;
}
/**
@ -76,9 +86,18 @@ public class SysMenuServiceImpl implements ISysMenuService
* @return 所有菜单信息
*/
@Override
public List<SysMenu> selectMenuAll()
public List<SysMenu> selectMenuAll(Long userId)
{
return menuMapper.selectMenuAll();
List<SysMenu> menuList = null;
if (SysUser.isAdmin(userId))
{
menuList = menuMapper.selectMenuAll();
}
else
{
menuList = menuMapper.selectMenuAllByUserId(userId);
}
return menuList;
}
/**
@ -109,11 +128,11 @@ public class SysMenuServiceImpl implements ISysMenuService
* @return 菜单列表
*/
@Override
public List<Ztree> roleMenuTreeData(SysRole role)
public List<Ztree> roleMenuTreeData(SysRole role, Long userId)
{
Long roleId = role.getRoleId();
List<Ztree> ztrees = new ArrayList<Ztree>();
List<SysMenu> menuList = menuMapper.selectMenuAll();
List<SysMenu> menuList = selectMenuAll(userId);
if (StringUtils.isNotNull(roleId))
{
List<String> roleMenuList = menuMapper.selectMenuTree(roleId);
@ -132,9 +151,9 @@ public class SysMenuServiceImpl implements ISysMenuService
* @return 菜单列表
*/
@Override
public List<Ztree> menuTreeData()
public List<Ztree> menuTreeData(Long userId)
{
List<SysMenu> menuList = menuMapper.selectMenuAll();
List<SysMenu> menuList = selectMenuAll(userId);
List<Ztree> ztrees = initZtree(menuList);
return ztrees;
}
@ -145,10 +164,10 @@ public class SysMenuServiceImpl implements ISysMenuService
* @return 权限列表
*/
@Override
public LinkedHashMap<String, String> selectPermsAll()
public LinkedHashMap<String, String> selectPermsAll(Long userId)
{
LinkedHashMap<String, String> section = new LinkedHashMap<>();
List<SysMenu> permissions = menuMapper.selectMenuAll();
List<SysMenu> permissions = selectMenuAll(userId);
if (StringUtils.isNotEmpty(permissions))
{
for (SysMenu menu : permissions)