fix

controllers/data_manage/bloomberg_data.go

@@ -418,6 +418,18 @@ func (this *BloombergDataController) AddCheck() {
 	orderType := map[int]string{0: "DESC", 1: "ASC", 2: "DESC"}
 	orderRule := fmt.Sprintf("%s %s", orderFields[req.SortField], orderType[req.SortRule])
 
+	// 获取指标库已有指标
+	existsEdb, e := data_manage.GetEdbCodesBySource(utils.DATA_SOURCE_BLOOMBERG)
+	if e != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取Bloomberg已添加的指标失败, Err: " + e.Error()
+		return
+	}
+	existMap := make(map[string]*data_manage.EdbInfo)
+	for _, v := range existsEdb {
+		existMap[v.EdbCode] = v
+	}
+
 	// 非全选-不需要频率等筛选条件
 	bloombergOb := new(data_manage.BaseFromBloombergIndex)
 	if !req.ListAll {
@@ -442,7 +454,15 @@ func (this *BloombergDataController) AddCheck() {
 		}
 		resp := make([]*data_manage.BaseFromBloombergIndexItem, 0)
 		for _, v := range list {
-			resp = append(resp, data_manage.FormatBaseFromBloombergIndex2Item(v))
+			t := data_manage.FormatBaseFromBloombergIndex2Item(v)
+			ed := existMap[v.IndexCode]
+			if ed != nil {
+				t.EdbExist = 1
+				t.EdbInfoId = ed.EdbInfoId
+				t.EdbUniqueCode = ed.UniqueCode
+				t.EdbClassifyId = ed.ClassifyId
+			}
+			resp = append(resp, t)
 		}
 
 		br.Data = resp
@@ -483,18 +503,6 @@ func (this *BloombergDataController) AddCheck() {
 		return
 	}
 
-	// 获取指标库已有指标
-	existsEdb, e := data_manage.GetEdbCodesBySource(utils.DATA_SOURCE_BLOOMBERG)
-	if e != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取Bloomberg已添加的指标失败, Err: " + e.Error()
-		return
-	}
-	existMap := make(map[string]*data_manage.EdbInfo)
-	for _, v := range existsEdb {
-		existMap[v.EdbCode] = v
-	}
-
 	resp := make([]*data_manage.BaseFromBloombergIndexItem, 0)
 	for _, v := range list {
 		t := data_manage.FormatBaseFromBloombergIndex2Item(v)