Merge branch 'release' into 'master'

Release

See merge request !485

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

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