Merge branch 'release' into 'master'

Release

See merge request !314

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

@@ -329,24 +329,22 @@ public class EsQueryTools {
     }
 
     public static void addSensitiveChannel(BrandkbsYuQingConfig config, BoolQueryBuilder boolQueryBuilder) {
+        BoolQueryBuilder hitBoolQuery = QueryBuilders.boolQuery();
         if (!Tools.isEmpty(config.getPoliticsLevels())) {
             List<String> hitList = config.getPoliticsLevels();
             if (config.getPoliticsLevels().contains("全部")) {
                 hitList = ChannelType.POLITICS_LEVELS;
             }
-            BoolQueryBuilder politicsLevelBool = QueryBuilders.boolQuery();
-            hitList.forEach(politicsLevel -> politicsLevelBool.should(QueryBuilders.termQuery(GenericAttribute.ES_SENSITIVE_CHANNEL + "." + GenericAttribute.ES_POLITICS_LEVEL + ".keyword", politicsLevel)));
-            boolQueryBuilder.must(politicsLevelBool);
+            hitList.forEach(politicsLevel -> hitBoolQuery.should(QueryBuilders.termQuery(GenericAttribute.ES_SENSITIVE_CHANNEL + "." + GenericAttribute.ES_POLITICS_LEVEL + ".keyword", politicsLevel)));
         }
         if (!Tools.isEmpty(config.getFields())) {
             List<String> hitList = config.getFields();
             if (config.getFields().contains("全部")) {
                 hitList = ChannelType.COMMON_FIELDS;
             }
-            BoolQueryBuilder fieldBool = QueryBuilders.boolQuery();
-            hitList.forEach(field -> fieldBool.should(QueryBuilders.termQuery(GenericAttribute.ES_SENSITIVE_CHANNEL + "." + GenericAttribute.ES_FIELD + ".keyword", field)));
-            boolQueryBuilder.must(fieldBool);
+            hitList.forEach(field -> hitBoolQuery.should(QueryBuilders.termQuery(GenericAttribute.ES_SENSITIVE_CHANNEL + "." + GenericAttribute.ES_FIELD + ".keyword", field)));
         }
+        boolQueryBuilder.must(hitBoolQuery);
     }
 
     public static void addSensitiveChannel(String politicsLevel, String field, String region, String mainBodyType, BoolQueryBuilder boolQueryBuilder) {