From 3e864f090119d55db6c2554c6fe56328f25f6616 Mon Sep 17 00:00:00 2001
From: liuxiaolong <736321739@qq.com>
Date: 星期三, 13 十一月 2019 10:35:20 +0800
Subject: [PATCH] reduce esSearch return data
---
controllers/esSearch.go | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/controllers/esSearch.go b/controllers/esSearch.go
index bd08e48..49be22c 100644
--- a/controllers/esSearch.go
+++ b/controllers/esSearch.go
@@ -191,22 +191,25 @@
masterInfo := masterInfoValues.(map[string]interface{})
sources := make(map[string]interface{}, 0)
sources["activeObject"] = masterInfo
- source := make([]map[string]interface{}, 0)
- source = append(source, masterInfo)
+
linkId := ""
if masterInfo["linkId"] != nil {
linkId = masterInfo["linkId"].(string)
}
id := masterInfo["id"].(string)
if linkId != "" {
+ slaveList := make([]map[string]interface{}, 0)
+ slaveList = append(slaveList, masterInfo)
linkInfo := GetLinkInfo(linkId, id)
for _, slaveInfoValues := range linkInfo {
slaveInfo := slaveInfoValues
- source = append(source, slaveInfo)
+ slaveList = append(slaveList, slaveInfo)
}
-
+ sources["list"] = slaveList
+ } else {
+ sources["list"] = []interface{}{}
}
- sources["list"] = source
+
tmpDate["datalist"] = append(tmpDate["datalist"], sources)
}
tmpAllDate["datalist"] = tmpDate["datalist"]
--
Gitblit v1.8.0