Merge branch 'hotfix/datasource_es_0205' into debug

controllers/data_manage/sci_hq_data.go

@@ -465,6 +465,11 @@ func (this *SciHqDataController) IndexPageList() {
 		indexList = tmpIndexList
 	}
 
+	// 唯一编码前端定位用
+	for _, v := range indexList {
+		v.UniqueCode = fmt.Sprintf("%d_%d", v.ClassifyId, v.BaseFromSciHqIndexId)
+	}
+
 	page := paging.GetPaging(currrentIndex, pageSize, total)
 	resp := new(response.SciHqIndexPageListResp)
 	resp.List = indexList

controllers/data_manage/smm_data.go

@@ -165,6 +165,7 @@ func (this *EdbInfoController) SmmIndexList() {
 			Level:                0,
 			Sort:                 0,
 			Children:             nil,
+			UniqueCode:           fmt.Sprintf("%d_%d", v.ClassifyId, v.BaseFromSmmIndexId),
 		}
 		list = append(list, tmp)
 	}

controllers/data_source/data_source.go

@@ -217,7 +217,10 @@ func (c *DataSourceController) SearchByEs() {
 		}
 	}
 
-	// 分类的唯一编码(前端定位用)
+	// 个别数据源需要统一唯一编码前端定位用
+	if primaryIdKey == "" {
+		primaryIdKey = "Id"
+	}
 	if classifyIdKey == "" {
 		classifyIdKey = "ClassifyId"
 	}
@@ -228,10 +231,14 @@ func (c *DataSourceController) SearchByEs() {
 		for _, v := range listMap {
 			classifyId, ok := v[classifyIdKey].(int)
 			if !ok {
-				v["ClassifyUniqueCode"] = ""
+				continue
+			}
+			id, ok := v[primaryIdKey].(int)
+			if !ok {
 				continue
 			}
 			v["ClassifyUniqueCode"] = strconv.Itoa(classifyId)
+			v["UniqueCode"] = fmt.Sprintf("%d_%d", classifyId, id)
 		}
 	}
 	//if source == utils.DATA_SOURCE_MANUAL {