From cfe3ea4764fb4645c5a9767b56e8e5b7eb43210f Mon Sep 17 00:00:00 2001 From: dhb52 Date: Mon, 20 Nov 2023 03:19:26 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20PlusDataPermissionHandler.findAnnotation?= =?UTF-8?q?=E5=8F=AF=E8=83=BD=E8=BF=94=E5=9B=9Enull=EF=BC=8C=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E5=9C=A8getSqlSegment=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: dhb52 --- .../ruoyi/framework/handler/PlusDataPermissionHandler.java | 5 +++++ 1 file changed, 5 insertions(+) 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 4299256a0..d1dcf1453 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 @@ -2,6 +2,7 @@ package com.ruoyi.framework.handler; import cn.hutool.core.annotation.AnnotationUtil; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ClassUtil; import cn.hutool.core.util.ObjectUtil; import com.ruoyi.common.annotation.DataColumn; @@ -62,6 +63,10 @@ public class PlusDataPermissionHandler { public Expression getSqlSegment(Expression where, String mappedStatementId, boolean isSelect) { DataColumn[] dataColumns = findAnnotation(mappedStatementId); + if (ArrayUtil.isEmpty(dataColumns)) { + return where; + } + LoginUser currentUser = DataPermissionHelper.getVariable("user"); if (ObjectUtil.isNull(currentUser)) { currentUser = LoginHelper.getLoginUser();