Merge branch 'feature' into 'dev'

修复topSource不准确bug

See merge request !61

src/main/java/com/zhiwei/brandkbs2/service/impl/MarkDataServiceImpl.java

@@ -1485,6 +1485,8 @@ public class MarkDataServiceImpl implements MarkDataService {
         if (StringUtils.isNotEmpty(emotion) && !EmotionEnum.ALL.getName().equals(emotion)) {
             query.must(QueryBuilders.termQuery("brandkbs_mark_cache_maps.name.keyword", emotion));
         }
+        searchHelper.setSize(0);
+        searchHelper.setQuery(query);
         // 搜索结果
         SearchResponse searchResponse = esClientDao.searchResponse(searchHelper);