update 优化 数据导致权限生成 SQL 重复问题

ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/handler/PlusDataPermissionHandler.java

@@ -1,12 +1,14 @@
 package com.ruoyi.common.mybatis.handler;
 
 import cn.hutool.core.annotation.AnnotationUtil;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.ConcurrentHashSet;
 import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ClassUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.ruoyi.common.core.exception.ServiceException;
 import com.ruoyi.common.core.utils.SpringUtils;
+import com.ruoyi.common.core.utils.StreamUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.mybatis.annotation.DataColumn;
 import com.ruoyi.common.mybatis.annotation.DataPermission;
@@ -30,11 +32,9 @@ import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.expression.spel.support.StandardEvaluationContext;
 
 import java.lang.reflect.Method;
-import java.util.Arrays;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -104,13 +104,13 @@ public class PlusDataPermissionHandler {
      * 构造数据过滤sql
      */
     private String buildDataFilter(DataColumn[] dataColumns, boolean isSelect) {
-        StringBuilder sqlString = new StringBuilder();
         // 更新或删除需满足所有条件
         String joinStr = isSelect ? " OR " : " AND ";
         LoginUser user = DataPermissionHelper.getVariable("user");
         StandardEvaluationContext context = new StandardEvaluationContext();
         context.setBeanResolver(beanResolver);
         DataPermissionHelper.getContext().forEach(context::setVariable);
+        Set<String> conditions = new HashSet<>();
         for (RoleDTO role : user.getRoles()) {
             user.setRoleId(role.getRoleId());
             // 获取角色权限泛型
@@ -140,17 +140,18 @@ public class PlusDataPermissionHandler {
 
                 // 解析sql模板并填充
                 String sql = parser.parseExpression(type.getSqlTemplate(), parserContext).getValue(context, String.class);
-                sqlString.append(joinStr).append(sql);
+                conditions.add(joinStr + sql);
                 isSuccess = true;
             }
             // 未处理成功则填充兜底方案
             if (!isSuccess && StringUtils.isNotBlank(type.getElseSql())) {
-                sqlString.append(joinStr).append(type.getElseSql());
+                conditions.add(joinStr + type.getElseSql());
             }
         }
 
-        if (StringUtils.isNotBlank(sqlString.toString())) {
+        if (CollUtil.isNotEmpty(conditions)) {
-            return sqlString.substring(joinStr.length());
+            String sql = StreamUtils.join(conditions, Function.identity(), "");
+            return sql.substring(joinStr.length());
         }
         return "";
     }