Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventor...

chenhj

9 天以前 76640d343082d1473a482e7ba48461db9b26c035

 src/main/java/com/ruoyi/framework/security/service/SysPermissionService.java

@@ -1,12 +1,18 @@
package com.ruoyi.framework.security.service;



import java.util.HashSet;

import java.util.Set;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Component;

import com.ruoyi.common.constant.UserConstants;

import com.ruoyi.common.utils.StringUtils;

import com.ruoyi.project.system.domain.SysRole;

import com.ruoyi.project.system.domain.SysUser;

import com.ruoyi.project.system.service.ISysMenuService;

import com.ruoyi.project.system.service.ISysRoleService;

import lombok.RequiredArgsConstructor;

import org.springframework.stereotype.Component;

import org.springframework.util.CollectionUtils;



import java.util.HashSet;

import java.util.List;

import java.util.Set;



/**

 * 用户权限处理

@@ -14,13 +20,11 @@
 * @author ruoyi

 */

@Component

@RequiredArgsConstructor

public class SysPermissionService

{

    @Autowired

    private ISysRoleService roleService;



    @Autowired

    private ISysMenuService menuService;

    private final ISysRoleService roleService;

    private final ISysMenuService menuService;



    /**

     * 获取角色数据权限

@@ -59,7 +63,24 @@
        }

        else

        {

            perms.addAll(menuService.selectMenuPermsByUserId(user.getUserId()));

            List<SysRole> roles = user.getRoles();

            if (!CollectionUtils.isEmpty(roles))

            {

                // 设置permissions属性，以便数据权限匹配权限

                for (SysRole role : roles)

                {

                    if (StringUtils.equals(role.getStatus(), UserConstants.ROLE_NORMAL) && !role.isAdmin())

                    {

                        Set<String> rolePerms = menuService.selectMenuPermsByRoleId(role.getRoleId());

                        role.setPermissions(rolePerms);

                        perms.addAll(rolePerms);

                    }

                }

            }

            else

            {

                perms.addAll(menuService.selectMenuPermsByUserId(user.getUserId()));

            }

        }

        return perms;

    }