From b18a6606017fefe4e4c40ae9251d6d0d7286314f Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Fri, 24 May 2024 14:58:41 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zhgd/mybatis/DataScopeHandler.java    | 35 +++++++++----------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/zhgd/mybatis/DataScopeHandler.java b/src/main/java/com/zhgd/mybatis/DataScopeHandler.java
index cfd039fb5..b5434f3b7 100644
--- a/src/main/java/com/zhgd/mybatis/DataScopeHandler.java
+++ b/src/main/java/com/zhgd/mybatis/DataScopeHandler.java
@@ -198,24 +198,6 @@ public class DataScopeHandler implements DataPermissionHandler {
                 }
 
             }
-
-            if (!DataScopeInterceptor.isNotSqlTest()) {
-                String sql = " ('1qqq')";
-                try {
-                    Expression expression = CCJSqlParserUtil.parseCondExpression(sql);
-                    Expression where = plainSelect.getWhere();
-                    if (where != null) {
-                        where = new AndExpression(where, expression);
-                    } else {
-                        where = expression;
-                    }
-                    plainSelect.setWhere(where);
-                } catch (JSQLParserException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-
-
             if (expressions.size() > 0) {
                 Expression dataExpression;
                 if (expressions.size() > 1) {
@@ -240,6 +222,23 @@ public class DataScopeHandler implements DataPermissionHandler {
 
         }
 
+
+        if (!DataScopeInterceptor.isNotSqlTest()) {
+            String sql = " ('1qqq')";
+            try {
+                Expression expression = CCJSqlParserUtil.parseCondExpression(sql);
+                Expression where = plainSelect.getWhere();
+                if (where != null) {
+                    where = new AndExpression(where, expression);
+                } else {
+                    where = expression;
+                }
+                plainSelect.setWhere(where);
+            } catch (JSQLParserException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
         //List<String> scopeIds = systemUserDataScopeService.list(Wrappers.<SystemUserDataScope>lambdaQuery().eq(SystemUserDataScope::getUserId, user.getUserId()))
         //        .stream().map(u -> u.getRelevanceId()).collect(Collectors.toList());
         //if (user.getAccountType() == 4) {