|
@@ -104,7 +104,7 @@ public class EventCatalogueController extends BaseESController {
|
|
|
BoolQueryBuilder queryBuilderOr = QueryBuilders.boolQuery();
|
|
|
if (StringUtils.isEmpty(bo.getEventTypeXls())) {
|
|
|
bo.getDefaultTypeXl().forEach(item -> queryBuilderOr.should().add(QueryBuilders.termQuery("eventTypeXl.keyword", item)));
|
|
|
- if (bo.getDefaultTypeXl().contains("0")) {
|
|
|
+ if (bo.getDefaultTypeXl().contains("1")) {
|
|
|
BoolQueryBuilder builder = QueryBuilders.boolQuery();
|
|
|
builder.must(QueryBuilders.termQuery("eventType.keyword", "1"));
|
|
|
BoolQueryBuilder builderOr = QueryBuilders.boolQuery();
|
|
@@ -115,7 +115,7 @@ public class EventCatalogueController extends BaseESController {
|
|
|
}
|
|
|
} else {
|
|
|
bo.getEventTypeXls().forEach(item -> queryBuilderOr.should().add(QueryBuilders.termQuery("eventTypeXl.keyword", item)));
|
|
|
- if (bo.getEventTypeXls().contains("0")) {
|
|
|
+ if (bo.getEventTypeXls().contains("1")) {
|
|
|
BoolQueryBuilder builder = QueryBuilders.boolQuery();
|
|
|
builder.must(QueryBuilders.termQuery("eventType.keyword", "1"));
|
|
|
BoolQueryBuilder builderOr = QueryBuilders.boolQuery();
|