diff --git a/backend/pom.xml b/backend/pom.xml index 4e31117b34..5aa8669469 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -112,7 +112,7 @@ com.github.pagehelper pagehelper - 5.0.3 + 5.3.0 org.apache.shiro @@ -329,11 +329,6 @@ org.apache.commons commons-pool2 - - com.github.jsqlparser - jsqlparser - 4.4 - @@ -482,45 +477,45 @@ - - org.apache.maven.plugins - maven-antrun-plugin - - - - main-class-placement - generate-resources - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - + - - - - run - - - - + + + + + + + + diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index e518c58384..0666745755 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -2517,11 +2517,11 @@ public class DataSetTableService { return; } - visitBinaryExpression(likeExpression, (likeExpression.isNot() ? " NOT" : "") + (likeExpression.isCaseInsensitive() ? " ILIKE " : " LIKE ")); - Expression escape = likeExpression.getEscape(); + visitBinaryExpression(likeExpression, + (likeExpression.isNot() ? " NOT" : "") + (likeExpression.isCaseInsensitive() ? " ILIKE " : " LIKE ")); + String escape = likeExpression.getEscape(); if (escape != null) { - getBuffer().append(" ESCAPE "); - likeExpression.getEscape().accept(this); + buffer.append(" ESCAPE '").append(escape).append('\''); } }