From 2917d335bc3fd1f6dfb57cbad6d73ba48bc5f9d7 Mon Sep 17 00:00:00 2001
From: konbai <1527468660@qq.com>
Date: 星期六, 19 二月 2022 16:15:44 +0800
Subject: [PATCH] update 优化 是否为管理员的判断
---
ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java
index 07795d9..7ecc12a 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/handler/PlusDataPermissionHandler.java
@@ -7,9 +7,8 @@
import cn.hutool.core.util.ObjectUtil;
import com.ruoyi.common.annotation.DataColumn;
import com.ruoyi.common.annotation.DataPermission;
-import com.ruoyi.common.core.domain.entity.SysRole;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.service.UserService;
+import com.ruoyi.common.core.domain.dto.RoleDTO;
+import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.enums.DataScopeType;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.helper.DataPermissionHelper;
@@ -74,13 +73,13 @@
inavlidCacheSet.add(mappedStatementId);
return where;
}
- SysUser currentUser = DataPermissionHelper.getVariable("user");
+ LoginUser currentUser = DataPermissionHelper.getVariable("user");
if (ObjectUtil.isNull(currentUser)) {
- currentUser = SpringUtils.getBean(UserService.class).selectUserById(LoginHelper.getUserId());
+ currentUser = LoginHelper.getLoginUser();
DataPermissionHelper.setVariable("user", currentUser);
}
// 濡傛灉鏄秴绾х鐞嗗憳锛屽垯涓嶈繃婊ゆ暟鎹�
- if (ObjectUtil.isNull(currentUser) || currentUser.isAdmin()) {
+ if (LoginHelper.isAdmin()) {
return where;
}
String dataFilterSql = buildDataFilter(dataColumns, isSelect);
@@ -108,11 +107,11 @@
StringBuilder sqlString = new StringBuilder();
// 鏇存柊鎴栧垹闄ら渶婊¤冻鎵�鏈夋潯浠�
String joinStr = isSelect ? " OR " : " AND ";
- SysUser user = DataPermissionHelper.getVariable("user");
+ LoginUser user = DataPermissionHelper.getVariable("user");
StandardEvaluationContext context = new StandardEvaluationContext();
context.setBeanResolver(beanResolver);
DataPermissionHelper.getContext().forEach(context::setVariable);
- for (SysRole role : user.getRoles()) {
+ for (RoleDTO role : user.getRoles()) {
user.setRoleId(role.getRoleId());
// 鑾峰彇瑙掕壊鏉冮檺娉涘瀷
DataScopeType type = DataScopeType.findCode(role.getDataScope());
--
Gitblit v1.9.3