From 26fc652d33fb82a75d6ec7771ca50ee414b21723 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 11 一月 2022 16:58:47 +0800
Subject: [PATCH] update 统一代码间隔符
---
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java | 29 +++++++++++++----------------
1 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
index 614451e..0e97b92 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
@@ -1,12 +1,8 @@
package com.ruoyi.framework.web.service;
-import com.ruoyi.common.core.domain.entity.SysRole;
-import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.core.service.UserService;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.spring.SpringUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -44,10 +40,10 @@
return false;
}
LoginUser loginUser = SecurityUtils.getLoginUser();
- if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getPermissions())) {
+ if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getMenuPermissions())) {
return false;
}
- return hasPermissions(loginUser.getPermissions(), permission);
+ return hasPermissions(loginUser.getMenuPermissions(), permission);
}
/**
@@ -71,10 +67,10 @@
return false;
}
LoginUser loginUser = SecurityUtils.getLoginUser();
- if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getPermissions())) {
+ if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getMenuPermissions())) {
return false;
}
- Set<String> authorities = loginUser.getPermissions();
+ Set<String> authorities = loginUser.getMenuPermissions();
for (String permission : permissions.split(PERMISSION_DELIMETER)) {
if (permission != null && hasPermissions(authorities, permission)) {
return true;
@@ -97,12 +93,11 @@
if (StringUtils.isNull(loginUser)) {
return false;
}
- SysUser sysUser = SpringUtils.getBean(UserService.class).selectUserById(loginUser.getUserId());
- if (CollectionUtils.isEmpty(sysUser.getRoles())) {
+ Set<String> rolePermissions = loginUser.getRolePermissions();
+ if (CollectionUtils.isEmpty(rolePermissions)) {
return false;
}
- for (SysRole sysRole : sysUser.getRoles()) {
- String roleKey = sysRole.getRoleKey();
+ for (String roleKey : rolePermissions) {
if (SUPER_ADMIN.equals(roleKey) || roleKey.equals(StringUtils.trim(role))) {
return true;
}
@@ -134,13 +129,15 @@
if (StringUtils.isNull(loginUser)) {
return false;
}
- SysUser sysUser = SpringUtils.getBean(UserService.class).selectUserById(loginUser.getUserId());
- if (CollectionUtils.isEmpty(sysUser.getRoles())) {
+ Set<String> rolePermissions = loginUser.getRolePermissions();
+ if (CollectionUtils.isEmpty(rolePermissions)) {
return false;
}
for (String role : roles.split(ROLE_DELIMETER)) {
- if (hasRole(role)) {
- return true;
+ for (String roleKey : rolePermissions) {
+ if (SUPER_ADMIN.equals(roleKey) || roleKey.equals(StringUtils.trim(role))) {
+ return true;
+ }
}
}
return false;
--
Gitblit v1.9.3