Merge branch 'feature' into 'release'

全网搜sorter统一

See merge request !198

src/main/java/com/zhiwei/brandkbs2/pojo/dto/SearchFilterDTO.java

 package com.zhiwei.brandkbs2.pojo.dto;
 
+import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -68,7 +69,7 @@ public class SearchFilterDTO {
      * 排序字段
      */
     @ApiModelProperty(value = "排序字段")
-    private String sorter;
+    private JSONObject sorter;
 
     /**
      * 排序字段(查商业数据库用)
@@ -134,7 +135,17 @@ public class SearchFilterDTO {
         map.put("endTime", endTime);
         map.put("source", sourceKeyword);
         map.put("url", hostKeyword);
-        map.put("sort", Objects.nonNull(sorter) ? sorter : "DESC");
+        if (null == sorter || sorter.isEmpty()) {
+            map.put("sort", "DESC");
+        } else {
+            for (Map.Entry<String, Object> entry : sorter.entrySet()) {
+                if (entry.getValue().toString().contains("desc")) {
+                    map.put("sort", "DESC");
+                } else {
+                    map.put("sort", "ASC");
+                }
+            }
+        }
         map.put("page", page);
         map.put("pageSize", pageSize);
         map.put("notWords", filterWords);