From 9658fec117e1eaf359ed729a967772acfea1deee Mon Sep 17 00:00:00 2001 From: zhaojingbo Date: Thu, 30 May 2024 16:45:21 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8Dwrapper=E4=B8=AD=E9=83=A8?= =?UTF-8?q?=E5=88=86condition=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../easyes/core/kernel/AbstractWrapper.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/easy-es-core/src/main/java/org/dromara/easyes/core/kernel/AbstractWrapper.java b/easy-es-core/src/main/java/org/dromara/easyes/core/kernel/AbstractWrapper.java index 15173ba..a843ae1 100644 --- a/easy-es-core/src/main/java/org/dromara/easyes/core/kernel/AbstractWrapper.java +++ b/easy-es-core/src/main/java/org/dromara/easyes/core/kernel/AbstractWrapper.java @@ -365,7 +365,7 @@ public final Children orderBy(boolean condition, boolean isAsc, String... column @Override public Children orderBy(boolean condition, List orderByParams) { - if (CollectionUtils.isNotEmpty(orderByParams)) { + if (condition && CollectionUtils.isNotEmpty(orderByParams)) { this.orderByParams = orderByParams; } return typedThis; @@ -440,7 +440,7 @@ public Children sortByScore(boolean condition, SortOrder sortOrder) { @Override public final Children groupBy(boolean condition, boolean enablePipeline, String... columns) { - if (ArrayUtils.isEmpty(columns)) { + if (!condition || ArrayUtils.isEmpty(columns)) { return typedThis; } Arrays.stream(columns).forEach(column -> doIt(condition, enablePipeline, AggregationTypeEnum.TERMS, column)); @@ -449,7 +449,7 @@ public final Children groupBy(boolean condition, boolean enablePipeline, String. @Override public Children termsAggregation(boolean condition, boolean enablePipeline, String... columns) { - if (ArrayUtils.isEmpty(columns)) { + if (!condition || ArrayUtils.isEmpty(columns)) { return typedThis; } Arrays.stream(columns).forEach(column -> doIt(condition, enablePipeline, AggregationTypeEnum.TERMS, column)); @@ -458,7 +458,7 @@ public Children termsAggregation(boolean condition, boolean enablePipeline, Stri @Override public Children avg(boolean condition, boolean enablePipeline, String... columns) { - if (ArrayUtils.isEmpty(columns)) { + if (!condition || ArrayUtils.isEmpty(columns)) { return typedThis; } Arrays.stream(columns).forEach(column -> doIt(condition, enablePipeline, AggregationTypeEnum.AVG, column)); @@ -467,7 +467,7 @@ public Children avg(boolean condition, boolean enablePipeline, String... columns @Override public Children min(boolean condition, boolean enablePipeline, String... columns) { - if (ArrayUtils.isEmpty(columns)) { + if (!condition || ArrayUtils.isEmpty(columns)) { return typedThis; } Arrays.stream(columns).forEach(column -> doIt(condition, enablePipeline, AggregationTypeEnum.MIN, column)); @@ -476,7 +476,7 @@ public Children min(boolean condition, boolean enablePipeline, String... columns @Override public Children max(boolean condition, boolean enablePipeline, String... columns) { - if (ArrayUtils.isEmpty(columns)) { + if (!condition || ArrayUtils.isEmpty(columns)) { return typedThis; } Arrays.stream(columns).forEach(column -> doIt(condition, enablePipeline, AggregationTypeEnum.MAX, column)); @@ -485,7 +485,7 @@ public Children max(boolean condition, boolean enablePipeline, String... columns @Override public Children sum(boolean condition, boolean enablePipeline, String... columns) { - if (ArrayUtils.isEmpty(columns)) { + if (!condition || ArrayUtils.isEmpty(columns)) { return typedThis; } Arrays.stream(columns).forEach(column -> doIt(condition, enablePipeline, AggregationTypeEnum.SUM, column));