From 17a85cefa1295d0560618f210355dd93b91daaa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9A=8F=E9=A3=8E=E9=9A=8F=E9=A3=98=E7=B5=AE?=
 <346616343@qq.com>
Date: Fri, 2 Jun 2023 11:44:33 +0000
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E6=A8=A1=E7=89=88=EF=BC=8C=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E4=BB=BB=E6=84=8F=E4=B8=AA=E4=B8=8D=E5=90=8C=E7=9A=84=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 随风随飘絮 <346616343@qq.com>
---
 .../ruoyi/framework/handler/PlusDataPermissionHandler.java | 7 +++----
 1 file changed, 3 insertions(+), 4 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 3825a0ba7..4fdf327e3 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
@@ -14,7 +14,6 @@ import com.ruoyi.common.enums.DataScopeType;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.helper.DataPermissionHelper;
 import com.ruoyi.common.helper.LoginHelper;
-import com.ruoyi.common.utils.StreamUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -34,7 +33,6 @@ import org.springframework.expression.spel.support.StandardEvaluationContext;
 import java.lang.reflect.Method;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -110,7 +108,7 @@ public class PlusDataPermissionHandler {
         StandardEvaluationContext context = new StandardEvaluationContext();
         context.setBeanResolver(beanResolver);
         DataPermissionHelper.getContext().forEach(context::setVariable);
-        Set<String> conditions = new HashSet<>();
+        List<String> conditions = new LinkedList<>();
         for (RoleDTO role : user.getRoles()) {
             user.setRoleId(role.getRoleId());
             // 获取角色权限泛型
@@ -150,7 +148,8 @@ public class PlusDataPermissionHandler {
         }
 
         if (CollUtil.isNotEmpty(conditions)) {
-            String sql = StreamUtils.join(conditions, Function.identity(), "");
+            conditions.sort((o1, o2) -> o1.length() > o2.length() ? -1 : 1);
+            String sql = conditions.get(0);
             return sql.substring(joinStr.length());
         }
         return "";