Merge branch 'release' into 'master'

Release

See merge request !532

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

@@ -3515,7 +3515,6 @@ public class MarkDataServiceImpl implements MarkDataService {
         try {
             BoolQueryBuilder query = getAllIndexSearchOriginQuery(dto);
             String[] indexes = esClientDao.getAllIndexes(dto.getStartTime(), dto.getEndTime());
-            Long total = esClientDao.count(indexes, query, null);
             // platform query
             if (Objects.equals("其他", dto.getPlatforms().get(0))){
                 List<String> platforms = getWholeSearchPlatformPercentage(dto).stream().map(json -> json.getString("platform")).collect(Collectors.toList());
@@ -3526,9 +3525,10 @@ public class MarkDataServiceImpl implements MarkDataService {
                 query.must(EsQueryTools.assemblePlatformQuery(GlobalPojo.PLATFORMS.stream()
                         .filter(platform -> Objects.equals(dto.getPlatforms().get(0), platform.getName())).collect(Collectors.toList())));
             }
+            Long total = esClientDao.count(indexes, query, null);
             int page = dto.getPage();
             int pageSize = dto.getPageSize();
-            FieldSortBuilder sort = new FieldSortBuilder("time").order(SortOrder.ASC);
+            FieldSortBuilder sort = new FieldSortBuilder(GenericAttribute.ES_TIME).order(SortOrder.DESC);
             SearchHits hits = esClientDao.searchHits(indexes, query, null, null, sort, (page - 1) * pageSize, pageSize, null);
             List<JSONObject> list = new ArrayList<>();
             for (SearchHit hit : hits) {
@@ -3537,7 +3537,7 @@ public class MarkDataServiceImpl implements MarkDataService {
                 jsonObject.put("platform", baseMap.getPlatform());
                 jsonObject.put("source", baseMap.getSource());
                 jsonObject.put("realSource", baseMap.getRealSource());
-                jsonObject.put("title", baseMap.getTitle());
+                jsonObject.put("title", baseMap.getTitleNullOptionalContent());
                 jsonObject.put("url", baseMap.getUrl());
                 jsonObject.put("time", baseMap.getTime());
                 list.add(jsonObject);