From f73ef989bc999788e67c8cc78404743e5dadb0b2 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Wed, 28 Dec 2022 15:21:18 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E6=9E=90sql=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../provider/query/sqlserver/SqlserverQueryProvider.java | 1 - .../io/dataease/service/dataset/DataSetTableService.java | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java index 8819b4da72..d178c7279e 100644 --- a/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java @@ -1338,7 +1338,6 @@ public class SqlserverQueryProvider extends QueryProvider { public List dateformat() { return JSONArray.parseArray("[\n" + "{\"dateformat\": \"102\", \"desc\": \"yyyy.mm.dd\"},\n" + - "{\"dateformat\": \"120\", \"desc\": \"yyyy-mm-dd\"},\n" + "{\"dateformat\": \"111\", \"desc\": \"yyyy/mm/dd\"},\n" + "{\"dateformat\": \"112\", \"desc\": \"yyyymmdd\"},\n" + "{\"dateformat\": \"120\", \"desc\": \"yyyy-mm-dd hh:mi:ss\"}\n" + 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 0d030d94f4..0b1291928b 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -2821,7 +2821,7 @@ public class DataSetTableService { boolean hasSubBinaryExpression = false; try { BinaryExpression leftBinaryExpression = (BinaryExpression) expr.getLeftExpression(); - hasSubBinaryExpression = leftBinaryExpression.getLeftExpression() instanceof Expression; + hasSubBinaryExpression = leftBinaryExpression instanceof AndExpression || leftBinaryExpression instanceof OrExpression; } catch (Exception e) { e.printStackTrace(); } @@ -2836,8 +2836,7 @@ public class DataSetTableService { hasSubBinaryExpression = false; try { BinaryExpression rightBinaryExpression = (BinaryExpression) expr.getRightExpression(); - hasSubBinaryExpression = rightBinaryExpression.getRightExpression() instanceof BinaryExpression; - + hasSubBinaryExpression = rightBinaryExpression instanceof AndExpression || rightBinaryExpression instanceof OrExpression;; } catch (Exception e) { } if (expr.getRightExpression() instanceof BinaryExpression && !hasSubBinaryExpression && hasVariable(expr.getRightExpression().toString())) {