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));