From 3bed24d4a41be6aaa6c02efd76d0091197b3ee73 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期二, 14 一月 2020 18:15:22 +0800
Subject: [PATCH] add update sort

---
 controllers/esSearch.go |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/controllers/esSearch.go b/controllers/esSearch.go
index 2d7a977..5eac425 100644
--- a/controllers/esSearch.go
+++ b/controllers/esSearch.go
@@ -201,7 +201,7 @@
 		"{\"range\":{\"linkTagInfo.picDate\":{\"from\":\"" + gteDate + "\",\"to\":\"" + lteDate + "\",\"include_lower\":true,\"include_upper\":true,\"boost\":1}}}" +
 		"]}}" +
 		"],\"minimum_should_match\":1}}," +
-		"\"sort\":[{\"_score\":{\"order\":\"desc\"}},{\"picDate\":{\"order\":\"desc\"}}]," +
+		"\"sort\":[{\"_score\":{\"order\":\"desc\"}},{\"updateTime\":{\"order\":\"desc\"}}]," +
 		"\"_source\":{\"includes\":[],\"excludes\":[\"*.feature\"]}" +
 		"}"
 	logger.Debug("findEsData.param:", prama)
@@ -215,7 +215,7 @@
 	for _, masterInfoValues := range data.([]interface{}) {
 		masterInfo := masterInfoValues.(map[string]interface{})
 		sources := make(map[string]interface{}, 0)
-
+		activateInfo := make(map[string]interface{})
 		if masterInfo["linkTagInfo"] != nil {
 			linkTagInfo := masterInfo["linkTagInfo"].([]interface{})
 			delete(masterInfo, "linkTagInfo")
@@ -223,11 +223,16 @@
 				slaveList := make([]interface{}, 0)
 				slaveList = append(slaveList, masterInfo)
 				slaveList = append(slaveList, linkTagInfo...)
+				for i, j := 0, len(slaveList)-1; i < j; i, j = i+1, j-1 {
+					slaveList[i], slaveList[j] = slaveList[j], slaveList[i]
+				}
 				sources["list"] = slaveList
+				activateInfo = slaveList[0].(map[string]interface{})
 			} else {
 				sources["list"] = []interface{}{
 					masterInfo,
 				}
+				activateInfo = masterInfo
 			}
 		} else {
 			if _, ok := masterInfo["linkTagInfo"]; ok {
@@ -236,9 +241,11 @@
 			sources["list"] = []interface{}{
 				masterInfo,
 			}
+			activateInfo = masterInfo
+
 		}
 
-		sources["activeObject"] = masterInfo
+		sources["activeObject"] = activateInfo
 
 		tmpDate["datalist"] = append(tmpDate["datalist"], sources)
 	}

--
Gitblit v1.8.0