|
|
@@ -514,7 +514,8 @@ func SearchEdbInfoData(keywordStr string, from, size, filterSource, source int,
|
|
|
// 如果是包含了数据查看（基础指标）的搜索，那么就需要加上这个条件；否则只看自己的指标+共享指标+公开指标
|
|
|
if edbInfoType == 0 && utils.InArrayByInt(edbTypeList, 1) {
|
|
|
// 基础指标（数据查看）
|
|
|
- shouldTermList = append(shouldTermList, map[string]interface{}{
|
|
|
+ childShouldTermList := make([]map[string]interface{}, 0)
|
|
|
+ childShouldTermList = append(childShouldTermList, map[string]interface{}{
|
|
|
"term": map[string]interface{}{
|
|
|
"EdbType": 1,
|
|
|
},
|
|
|
@@ -523,6 +524,13 @@ func SearchEdbInfoData(keywordStr string, from, size, filterSource, source int,
|
|
|
"EdbInfoType": 0,
|
|
|
},
|
|
|
})
|
|
|
+
|
|
|
+ mustCondition := map[string]interface{}{
|
|
|
+ "bool": map[string]interface{}{
|
|
|
+ "must": childShouldTermList,
|
|
|
+ },
|
|
|
+ }
|
|
|
+ shouldTermList = append(shouldTermList, mustCondition)
|
|
|
}
|
|
|
|
|
|
shouldMap := map[string]interface{}{
|
