Merge branch 'feature' into 'dev'

调整nested查询语句2

See merge request !96

src/main/java/com/zhiwei/brandkbs2/es/EsQueryTools.java

@@ -100,12 +100,14 @@ public class EsQueryTools {
             // 不组装mediaTypes的情况
             nestedBoolQueryBuilder.must(cacheMapsNestedQuery(mustQuery));
         } else {
+            BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
             mediaTypes.forEach(e -> {
                 BoolQueryBuilder mediaTypeQueryBuilder = QueryBuilders.boolQuery();
                 mediaTypeQueryBuilder.must(QueryBuilders.termQuery("brandkbs_cache_maps.channel_type.keyword", e));
                 mediaTypeQueryBuilder.must(mustQuery);
-                nestedBoolQueryBuilder.should(cacheMapsNestedQuery(mediaTypeQueryBuilder));
+                boolQueryBuilder.should(cacheMapsNestedQuery(mediaTypeQueryBuilder));
             });
+            nestedBoolQueryBuilder.must(boolQueryBuilder);
         }
         return nestedBoolQueryBuilder;
     }
@@ -117,12 +119,14 @@ public class EsQueryTools {
             // 不组装mediaTypes的情况
             nestedBoolQueryBuilder.must(cacheMapsNestedQuery(mustQuery));
         } else {
+            BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
             mediaTypes.forEach(e -> {
                 BoolQueryBuilder mediaTypeQueryBuilder = QueryBuilders.boolQuery();
                 mediaTypeQueryBuilder.must(QueryBuilders.termQuery("brandkbs_cache_maps.channel_type.keyword", e));
                 mediaTypeQueryBuilder.must(mustQuery);
-                nestedBoolQueryBuilder.should(cacheMapsNestedQuery(mediaTypeQueryBuilder));
+                boolQueryBuilder.should(cacheMapsNestedQuery(mediaTypeQueryBuilder));
             });
+            nestedBoolQueryBuilder.must(boolQueryBuilder);
         }
         return nestedBoolQueryBuilder;
     }