From c18930191552c2e180f4ce1478862cd739754a5c Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 20 Nov 2023 18:06:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8D=87=E7=BA=A7=20jsqlparser?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/backend/pom.xml                            | 17 +++++++++++++++++
 .../service/dataset/DataSetTableService.java    |  5 ++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/core/backend/pom.xml b/core/backend/pom.xml
index 69d5e919d3..926ece9e33 100644
--- a/core/backend/pom.xml
+++ b/core/backend/pom.xml
@@ -99,6 +99,17 @@
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper</artifactId>
             <version>5.3.1</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>jsqlparser</artifactId>
+                    <groupId>com.github.jsqlparser</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.github.jsqlparser</groupId>
+            <artifactId>jsqlparser</artifactId>
+            <version>4.6</version>
         </dependency>
         <dependency>
             <groupId>org.apache.shiro</groupId>
@@ -331,6 +342,12 @@
             <artifactId>ashot</artifactId>
             <version>1.5.4</version>
         </dependency>
+        <dependency>
+            <groupId>io.dataease</groupId>
+            <artifactId>dataease-plugin-common</artifactId>
+            <version>1.18.11</version>
+            <scope>compile</scope>
+        </dependency>
 
 
     </dependencies>
diff --git a/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
index 19586b83dc..1ac62f60d3 100644
--- a/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/core/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -2865,9 +2865,8 @@ public class DataSetTableService {
 
                 visitBinaryExpression(likeExpression,
                         (likeExpression.isNot() ? " NOT" : "") + (likeExpression.isCaseInsensitive() ? " ILIKE " : " LIKE "));
-                String escape = likeExpression.getEscape();
-                if (escape != null) {
-                    buffer.append(" ESCAPE '").append(escape).append('\'');
+                if (likeExpression.getEscape() != null) {
+                    buffer.append(" ESCAPE '").append(likeExpression.getEscape()).append('\'');
                 }
             }