|
@@ -74,18 +74,18 @@ public class SysMenuServiceImpl extends ServiceImpl<ISysMenuMapper, SysMenu> imp
|
|
|
SysUser user = userService.getById(userId);
|
|
|
List<SysMenu> menuList = this.getListByUserId(userId);
|
|
|
List<Long> menuIds = menuList.parallelStream().map(SysMenu::getId).collect(Collectors.toList());
|
|
|
- menuList.forEach(sysMenu -> setMenuIds(menuIds,sysMenu));
|
|
|
+ //menuList.forEach(sysMenu -> setMenuIds(menuIds,sysMenu));
|
|
|
return getByRoleId(menuIds, user.getRoleId());
|
|
|
}
|
|
|
|
|
|
|
|
|
- private void setMenuIds( List<Long> menuIds ,SysMenu sysMenu){
|
|
|
- if(sysMenu.getParentId()!= null && !menuIds.contains(sysMenu.getParentId())) {
|
|
|
- menuIds.add(sysMenu.getParentId());
|
|
|
- SysMenu menu = this.getById(sysMenu.getParentId());
|
|
|
- this.setMenuIds(menuIds,menu);
|
|
|
- }
|
|
|
- }
|
|
|
+// private void setMenuIds( List<Long> menuIds ,SysMenu sysMenu){
|
|
|
+// if(sysMenu.getParentId()!= null && !menuIds.contains(sysMenu.getParentId())) {
|
|
|
+// menuIds.add(sysMenu.getParentId());
|
|
|
+// SysMenu menu = this.getById(sysMenu.getParentId());
|
|
|
+// this.setMenuIds(menuIds,menu);
|
|
|
+// }
|
|
|
+// }
|
|
|
|
|
|
@Override
|
|
|
public List<SysMenuVo> getByRoleId(List<Long> menuIds ,Long roleId) {
|