浏览代码

fix:数据源指标不在指标库报错

zqbao 7 月之前
父节点
当前提交
20602f80f4
共有 1 个文件被更改,包括 6 次插入2 次删除
  1. 6 2
      controllers/data_manage/sci_hq_data.go

+ 6 - 2
controllers/data_manage/sci_hq_data.go

@@ -514,11 +514,15 @@ func (this *SciHqDataController) SingleData() {
 		return
 	}
 	edbInfo, err := data_manage.GetEdbInfoByEdbCode(utils.DATA_SOURCE_SCI_HQ, indexInfo.IndexCode)
-	if err != nil {
+	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "获取指标数据失败"
 		br.ErrMsg = "获取指标库数据失败,Err:" + err.Error()
 		return
 	}
+	var edbInfoId int
+	if edbInfo != nil {
+		edbInfoId = edbInfo.EdbInfoId
+	}
 	dataList, err := data_manage.GetSciHqDataByIndexId(baseFromSciHqIndexId)
 	if err != nil {
 		br.Msg = "获取数据失败"
@@ -529,7 +533,7 @@ func (this *SciHqDataController) SingleData() {
 	ret.ClassifyId = indexInfo.ClassifyId
 	ret.BaseFromSciHqIndexId = indexInfo.BaseFromSciHqIndexId
 	ret.IndexCode = indexInfo.IndexCode
-	ret.EdbInfoId = edbInfo.EdbInfoId
+	ret.EdbInfoId = edbInfoId
 	ret.IndexName = indexInfo.IndexName
 	ret.Frequency = indexInfo.Frequency
 	ret.CreateTime = indexInfo.CreateTime.Format(utils.FormatDateTime)