Merge branch 'feature' into 'release'

舆情库customTags筛选修复

See merge request !584

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

@@ -143,7 +143,7 @@ public class EsQueryTools {
         BoolQueryBuilder tagBoolQuery = QueryBuilders.boolQuery();
         groupTagIds.forEach((group, list) -> {
             BoolQueryBuilder tagQuery = QueryBuilders.boolQuery();
-            list.forEach(e -> tagQuery.should(QueryBuilders.termQuery("brandkbs_mark_cache_maps.unique_id.keyword", e)));
+            list.forEach(e -> tagQuery.must(QueryBuilders.termQuery("brandkbs_mark_cache_maps.unique_id.keyword", e)));
             tagBoolQuery.must(tagQuery);
         });
         return tagBoolQuery;