update
This commit is contained in:
@@ -1,15 +1,17 @@
|
||||
package com.ruoyi.framework.web.service;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
import com.ruoyi.common.core.domain.entity.SysRole;
|
||||
import com.ruoyi.common.core.domain.entity.SysUser;
|
||||
import com.ruoyi.system.service.ISysMenuService;
|
||||
import com.ruoyi.system.service.ISysRoleService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 用户权限处理
|
||||
@@ -52,14 +54,15 @@ public class SysPermissionService
|
||||
* @param user 用户信息
|
||||
* @return 角色权限信息
|
||||
*/
|
||||
public Set<SysRole> getSysRolePermission(SysUser user)
|
||||
public List<SysRole> getSysRolePermission(SysUser user)
|
||||
{
|
||||
Set<SysRole> roles = new HashSet<SysRole>();
|
||||
List<SysRole> roleList = roleService.selectRolesByUserId(user.getUserId());
|
||||
if (roleList != null && !roleList.isEmpty()) {
|
||||
roles.addAll(roleList);
|
||||
roleList = roles.stream().collect(Collectors.toList());;
|
||||
}
|
||||
return roles;
|
||||
return roleList;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user