计算指标和预测指标都要添加引用

services/data/edb_info_relation.go

@@ -96,7 +96,7 @@ func saveEdbInfoRelation(edbInfoIds []int, objectId, objectType, objectSubType i
 				RelationTime:       nowTime,
 			}
 			addList = append(addList, tmp)
-			if edbInfo.EdbType == 2 {
+			if edbInfo.EdbType == 2 || edbInfo.EdbInfoType == 1 {
 				childEdbMappingIds, ok1 := calculateEdbMappingIdsMap[edbInfo.EdbInfoId]
 				if !ok1 {
 					continue
@@ -286,7 +286,7 @@ func SaveCalendarEdbInfoRelation(chartPermissionId int, matterDate string, editM
 			}
 			addList = append(addList, tmp)
 			//添加指标间接引用
-			if edbInfo.EdbType == 2 {
+			if edbInfo.EdbType == 2 || edbInfo.EdbInfoType == 1 {
 				childEdbMappingIds, ok1 := calculateEdbMappingIdsMap[edbInfo.EdbInfoId]
 				if !ok1 {
 					continue
@@ -412,7 +412,7 @@ func GetEdbListByEdbInfoId(edbInfoList []*data_manage.EdbInfo) (edbInfoMap map[i
 	}
 	edbInfoIds := make([]int, 0)
 	for _, v := range edbInfoList {
-		if v.EdbType == 2 {
+		if v.EdbType == 2 || v.EdbInfoType == 1 {
 			edbInfoIds = append(edbInfoIds, v.EdbInfoId)
 		}
 	}
@@ -442,7 +442,7 @@ func GetEdbListByEdbInfoId(edbInfoList []*data_manage.EdbInfo) (edbInfoMap map[i
 	edbInfoMappingRootIdsMap = make(map[int][]int, 0)
 	edbMappingMap := make(map[int]struct{})
 	for _, edbInfo := range edbInfoList {
-		if edbInfo.EdbType == 2 {
+		if edbInfo.EdbType == 2 || edbInfo.EdbInfoType == 1 {
 			edbInfoId := edbInfo.EdbInfoId
 			edbMappingList, err = getCalculateEdbInfoByEdbInfoId(allEdbMappingMap, edbInfoId, hasFindMap, edbInfoIdMap, edbMappingList, edbMappingMap, edbInfoMappingRootIdsMap, edbInfoId)
 			if err != nil {