From c2708f2ba4f3da914580ed2638fa84403b10226d Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Fri, 30 Sep 2022 11:48:39 +0800
Subject: [PATCH] 若依 3.6.1
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java
index 47f4961..d6750af 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java
@@ -1,15 +1,21 @@
package com.ruoyi.system.service.impl;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
+import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.service.ISysMenuService;
import com.ruoyi.system.service.ISysPermissionService;
import com.ruoyi.system.service.ISysRoleService;
+/**
+ * 用户权限处理
+ *
+ * @author ruoyi
+ */
@Service
public class SysPermissionServiceImpl implements ISysPermissionService
{
@@ -26,17 +32,17 @@
* @return 角色权限信息
*/
@Override
- public Set<String> getRolePermission(Long userId)
+ public Set<String> getRolePermission(SysUser user)
{
Set<String> roles = new HashSet<String>();
// 管理员拥有所有权限
- if (SysUser.isAdmin(userId))
+ if (user.isAdmin())
{
roles.add("admin");
}
else
{
- roles.addAll(roleService.selectRolePermissionByUserId(userId));
+ roles.addAll(roleService.selectRolePermissionByUserId(user.getUserId()));
}
return roles;
}
@@ -48,17 +54,31 @@
* @return 菜单权限信息
*/
@Override
- public Set<String> getMenuPermission(Long userId)
+ public Set<String> getMenuPermission(SysUser user)
{
Set<String> perms = new HashSet<String>();
// 管理员拥有所有权限
- if (SysUser.isAdmin(userId))
+ if (user.isAdmin())
{
perms.add("*:*:*");
}
else
{
- perms.addAll(menuService.selectMenuPermsByUserId(userId));
+ List<SysRole> roles = user.getRoles();
+ if (!roles.isEmpty() && roles.size() > 1)
+ {
+ // 多角色设置permissions属性，以便数据权限匹配权限
+ for (SysRole role : roles)
+ {
+ Set<String> rolePerms = menuService.selectMenuPermsByRoleId(role.getRoleId());
+ role.setPermissions(rolePerms);
+ perms.addAll(rolePerms);
+ }
+ }
+ else
+ {
+ perms.addAll(menuService.selectMenuPermsByUserId(user.getUserId()));
+ }
}
return perms;
}
--
Gitblit v1.9.3