Merge branch 'feature/eta1.9.1' into debug

services/edb_info_relation.go

@@ -236,8 +236,8 @@ func FindBaseEdbInfo(edbInfoId int, baseEdbInfoList []int, hasFind map[int]struc
 	}
 	hasFind[edbInfoId] = struct{}{}
 	for _, mapping := range newMappingList {
+		newBaseEdbInfoList = append(newBaseEdbInfoList, mapping.FromEdbInfoId)
 		if mapping.EdbType == 1 { // 如果是基础指标，则加入，否则继续找
-			newBaseEdbInfoList = append(newBaseEdbInfoList, mapping.FromEdbInfoId)
 		} else {
 			newBaseEdbInfoList, err = FindBaseEdbInfo(mapping.FromEdbInfoId, newBaseEdbInfoList, hasFind)
 		}