Skip to content

fix:修复wrapper中部分condition不生效的bug #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zjb-it wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix:修复wrapper中部分condition不生效的bug #114

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions easy-es-core/src/main/java/org/dromara/easyes/core/kernel/AbstractWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ public final Children orderBy(boolean condition, boolean isAsc, String... column

@Override
public Children orderBy(boolean condition, List<OrderByParam> orderByParams) {
if (CollectionUtils.isNotEmpty(orderByParams)) {
if (condition && CollectionUtils.isNotEmpty(orderByParams)) {
this.orderByParams = orderByParams;
}
return typedThis;
Expand Down Expand Up @@ -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));
Expand All @@ -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));
Expand All @@ -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));
Expand All @@ -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));
Expand All @@ -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));
Expand All @@ -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));
Expand Down