opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-21 02:25:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pre Merge pull request !413 from 其实我是kala/5.X

Browse Source
This commit is contained in:
其实我是kala 2023-08-24 16:49:20 +00:00 committed by Gitee
commit fd8f2c96d5
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java
View File

@ -1,5 +1,6 @@
package org.dromara.common.mybatis.handler; package org.dromara.common.mybatis.handler;
import cn.dev33.satoken.spring.SpringMVCUtil;
import cn.hutool.core.annotation.AnnotationUtil; import cn.hutool.core.annotation.AnnotationUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.collection.ConcurrentHashSet; import cn.hutool.core.collection.ConcurrentHashSet;
@ -72,6 +73,10 @@ public class PlusDataPermissionHandler {
invalidCacheSet.add(mappedStatementId); invalidCacheSet.add(mappedStatementId);
return where; return where;
} }
// scheduler 为非web环境，参考为admin
if (!SpringMVCUtil.isWeb()) {
return where;
}
LoginUser currentUser = DataPermissionHelper.getVariable("user"); LoginUser currentUser = DataPermissionHelper.getVariable("user");
if (ObjectUtil.isNull(currentUser)) { if (ObjectUtil.isNull(currentUser)) {
currentUser = LoginHelper.getLoginUser(); currentUser = LoginHelper.getLoginUser();