From 71d190d38c5140a77f3aa1000b9369d9d03fc44d Mon Sep 17 00:00:00 2001 From: junjie Date: Tue, 6 Jul 2021 15:04:42 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A7=86=E5=9B=BE=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../provider/doris/DorisQueryProvider.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java b/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java index 0e1e1ff255..93e1f35fa6 100644 --- a/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java @@ -233,11 +233,11 @@ public class DorisQueryProvider extends QueryProvider { } filter.append(transMysqlFilterTerm(f.getTerm())); if (StringUtils.equalsIgnoreCase(f.getTerm(), "null")) { - filter.append("(null,'')"); + filter.append("(null)"); } else if (StringUtils.equalsIgnoreCase(f.getTerm(), "not_null")) { - filter.append(" AND _") - .append(y.getSummary()).append("_").append(StringUtils.equalsIgnoreCase(y.getDataeaseName(), "*") ? "" : y.getDataeaseName()) - .append(" <> ''"); +// filter.append(" AND _") +// .append(y.getSummary()).append("_").append(StringUtils.equalsIgnoreCase(y.getDataeaseName(), "*") ? "" : y.getDataeaseName()) +// .append(" <> ''"); } else if (StringUtils.containsIgnoreCase(f.getTerm(), "in")) { filter.append("('").append(StringUtils.join(f.getValue(), "','")).append("')"); } else if (StringUtils.containsIgnoreCase(f.getTerm(), "like")) { @@ -319,11 +319,11 @@ public class DorisQueryProvider extends QueryProvider { } filter.append(transMysqlFilterTerm(f.getTerm())); if (StringUtils.equalsIgnoreCase(f.getTerm(), "null")) { - filter.append("(null,'')"); + filter.append("(null)"); } else if (StringUtils.equalsIgnoreCase(f.getTerm(), "not_null")) { - filter.append(" AND _") - .append(y.getSummary()).append("_").append(StringUtils.equalsIgnoreCase(y.getDataeaseName(), "*") ? "" : y.getDataeaseName()) - .append(" <> ''"); +// filter.append(" AND _") +// .append(y.getSummary()).append("_").append(StringUtils.equalsIgnoreCase(y.getDataeaseName(), "*") ? "" : y.getDataeaseName()) +// .append(" <> ''"); } else if (StringUtils.containsIgnoreCase(f.getTerm(), "in")) { filter.append("('").append(StringUtils.join(f.getValue(), "','")).append("')"); } else if (StringUtils.containsIgnoreCase(f.getTerm(), "like")) {