Merge remote-tracking branch 'origin/dev' into satoken

疯狂的狮子li

2021-09-28 76a2e7f8e5978e9ee13d7401c7153820b309cd6d

 ruoyi-system/src/main/java/com/ruoyi/system/service/SysPermissionService.java

@@ -2,19 +2,19 @@

import com.ruoyi.common.core.domain.entity.SysUser;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;

import java.util.HashSet;
import java.util.Set;

/**
 * 用户权限处理
 * 
 *
 * @author ruoyi
 */
@Component
public class SysPermissionService
{
@Service
public class SysPermissionService {

    @Autowired
    private ISysRoleService roleService;

@@ -23,20 +23,16 @@

    /**
     * 获取角色数据权限
     * 
     *
     * @param user 用户信息
     * @return 角色权限信息
     */
    public Set<String> getRolePermission(SysUser user)
    {
    public Set<String> getRolePermission(SysUser user) {
        Set<String> roles = new HashSet<String>();
        // 管理员拥有所有权限
        if (user.isAdmin())
        {
        if (user.isAdmin()) {
            roles.add("admin");
        }
        else
        {
        } else {
            roles.addAll(roleService.selectRolePermissionByUserId(user.getUserId()));
        }
        return roles;
@@ -44,20 +40,16 @@

    /**
     * 获取菜单数据权限
     * 
     *
     * @param user 用户信息
     * @return 菜单权限信息
     */
    public Set<String> getMenuPermission(SysUser user)
    {
    public Set<String> getMenuPermission(SysUser user) {
        Set<String> perms = new HashSet<String>();
        // 管理员拥有所有权限
        if (user.isAdmin())
        {
        if (user.isAdmin()) {
            perms.add("*:*:*");
        }
        else
        {
        } else {
            perms.addAll(menuService.selectMenuPermsByUserId(user.getUserId()));
        }
        return perms;