From c4c73a384c1a02c26c81b0a76bb1d10062e64cb4 Mon Sep 17 00:00:00 2001
From: sunty <1172534965@qq.com>
Date: 星期四, 14 十一月 2019 17:28:23 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/webserver
---
controllers/esSearch.go | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/controllers/esSearch.go b/controllers/esSearch.go
index 49c0be2..1d4dcdb 100644
--- a/controllers/esSearch.go
+++ b/controllers/esSearch.go
@@ -192,20 +192,25 @@
sources := make(map[string]interface{}, 0)
if masterInfo["linkTagInfo"] != nil {
- linkTagInfo := masterInfo["linkTagInfo"].([]map[string]interface{})
+ linkTagInfo := masterInfo["linkTagInfo"].([]interface{})
+ delete(masterInfo, "linkTagInfo")
if len(linkTagInfo) >0 {
- slaveList := make([]map[string]interface{}, 0)
+ slaveList := make([]interface{}, 0)
slaveList = append(slaveList, masterInfo)
slaveList = append(slaveList, linkTagInfo...)
sources["list"] = slaveList
} else {
- sources["list"] = []interface{}{}
+ sources["list"] = []interface{}{
+ masterInfo,
+ }
}
} else {
- sources["list"] = []interface{}{}
- }
- if _,ok := masterInfo["linkTagInfo"];ok {
- delete(masterInfo, "linkTagInfo")
+ if _,ok := masterInfo["linkTagInfo"];ok {
+ delete(masterInfo, "linkTagInfo")
+ }
+ sources["list"] = []interface{}{
+ masterInfo,
+ }
}
sources["activeObject"] = masterInfo
--
Gitblit v1.8.0