From 5cf45e866329428864bc1c3ec1a0f67ba282fc8a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 07 三月 2023 18:20:55 +0800
Subject: [PATCH] update springboot 3.0.2 => 3.0.4 update easyexcel 3.2.0 => 3.2.1 update hutool 5.8.11 => 5.8.14 update redisson 3.19.2 => 3.20.0 update lombok 1.18.24 => 1.18.26 update maven-compiler-plugin 3.10.1 => 3.11.0 update maven-surefire-plugin 3.0.0-M7 => 3.0.0-M9
---
ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/handler/PlusDataPermissionHandler.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/handler/PlusDataPermissionHandler.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/handler/PlusDataPermissionHandler.java
index 42e238a..6e238a8 100644
--- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/handler/PlusDataPermissionHandler.java
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/handler/PlusDataPermissionHandler.java
@@ -35,7 +35,6 @@
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Function;
-import java.util.stream.Collectors;
/**
* 鏁版嵁鏉冮檺杩囨护
@@ -78,8 +77,8 @@
currentUser = LoginHelper.getLoginUser();
DataPermissionHelper.setVariable("user", currentUser);
}
- // 濡傛灉鏄秴绾х鐞嗗憳锛屽垯涓嶈繃婊ゆ暟鎹�
- if (LoginHelper.isAdmin()) {
+ // 濡傛灉鏄秴绾х鐞嗗憳鎴栫鎴风鐞嗗憳锛屽垯涓嶈繃婊ゆ暟鎹�
+ if (LoginHelper.isSuperAdmin() || LoginHelper.isTenantAdmin()) {
return where;
}
String dataFilterSql = buildDataFilter(dataColumns, isSelect);
--
Gitblit v1.9.3