Merge branch 'feature/eta_2.5.6_pb_data_deal' into debug

controllers/data_manage/edb_info.go

@@ -2249,7 +2249,15 @@ func (this *EdbInfoController) EdbInfoList() {
 	edbInfoItem.FrequencyEn = data.GetFrequencyEn(edbInfoItem.Frequency)
 	// 获取是否供应商停更
 	edbInfoItem.IsSupplierStop = data.GetIsSupplierStop(edbInfoItem.Source, edbInfoItem.EdbCode)
-
+	relation, err := data.GetEdbRelationListById(edbInfoItem.EdbInfoId, edbInfoItem.Source)
+	if err != nil && !utils.IsErrNoRow(err) {
+		br.Msg = "获取指标引用信息失败"
+		br.ErrMsg = "获取指标引用信息失败,Err:" + err.Error()
+		return
+	}
+	if relation != nil && relation.RelationNum > 0 {
+		edbInfoItem.IsRelation = true
+	}
 	//查询目录
 	classifyList, err, errMsg := data.GetFullClassifyByClassifyId(edbInfoItem.ClassifyId)
 	if err != nil {
@@ -3906,15 +3914,14 @@ func (this *ChartInfoController) EdbInfoData() {
 	fullEdb.IsSupplierStop = data.GetIsSupplierStop(edbInfo.Source, edbInfo.EdbCode)
 	//是否被引用
 	relation, err := data.GetEdbRelationListById(edbInfo.EdbInfoId, edbInfo.Source)
-	if err != nil {
+	if err != nil && !utils.IsErrNoRow(err) {
 		br.Msg = err.Error()
 		br.ErrMsg = "获取指标关联关系失败，err:" + err.Error()
 		return
 	}
-	if relation.RelationNum > 0 {
+	if relation != nil && relation.RelationNum > 0 {
 		fullEdb.IsRelation = true
 	}
-
 	fullEdb.ClassifyList = classifyList
 
 	var currClassifyItem *data_manage.EdbClassifyIdItems
@@ -5683,12 +5690,12 @@ func (this *EdbInfoController) EdbChartList() {
 				}
 				var relation *data_manage.BaseRelationEdbInfo
 				relation, err = data.GetEdbRelationListById(v.EdbInfoId, v.Source)
-				if err != nil {
+				if err != nil && !utils.IsErrNoRow(err) {
 					br.Msg = "获取失败"
 					br.ErrMsg = "获取数据引用信息失败，Err:" + e.Error()
 					return
 				}
-				if relation.RelationNum > 0 {
+				if relation != nil && relation.RelationNum > 0 {
 					v.IsRelation = true
 				}
 			}