Merge branch 'fix/trace_edb' into debug

# Conflicts:
#	models/edb_data_base.go

models/edb_data_base.go

@@ -161,6 +161,7 @@ func GetEdbDataTableName(source, subSource int) (tableName string) {
 	case utils.DATA_SOURCE_CALCULATE_ZDYFX:
 		tableName = "edb_data_calculate_zdyfx" // 自定义分析->74
 	case utils.DATA_SOURCE_CALCULATE_RJZ: //日均值->75
+		tableName = "edb_data_calculate_rjz"
 	case utils.DATA_SOURCE_GFEX: //广州期货交易所->76
 		tableName = "edb_data_gz"
 	case utils.DATA_SOURCE_ICPI: //日均值->75

services/data/edb_info.go

@@ -1188,7 +1188,7 @@ func traceEdbInfoByEdbInfoId(edbInfoId int, traceEdbInfo data_manage.TraceEdbInf
 		}
 
 		// 计算指标/预测指标继续溯源
-		if v.FromEdbType == 2 || v.FromEdbInfoType == 1 {
+		if edbInfoId != v.FromEdbInfoId && (v.FromEdbType == 2 || v.FromEdbInfoType == 1) {
 			// 查过了就不查了
 			if _, ok2 := findIdMap[tmpEdbInfoId]; !ok2 {
 				tmpTraceEdbInfo.Child, e = traceEdbInfoByEdbInfoId(tmpEdbInfoId, tmpTraceEdbInfo, edbInfoRuleMap, findIdMap, existMap, edbMappingMap)