Merge remote-tracking branch 'origin/master' into debug

# Conflicts:
#	controllers/data_source/icpi.go
#	models/data_manage/edb_data_base.go
#	routers/commentsRouter.go

controllers/data_source/icpi.go

@@ -1,7 +1,6 @@
 package data_source
 
 import (
-	"eta/eta_api/controllers"
 	"eta/eta_api/models"
 	"eta/eta_api/models/data_source"
 	"eta/eta_api/utils"
@@ -14,9 +13,6 @@ import (
 )
 
 // 消费者价格指数
-type DataSourceIcpiController struct {
-	controllers.BaseAuthController
-}
 
 // ComTradeCountryList
 // @Title 获取居民消费价格指数分类

models/data_manage/edb_data_base.go

@@ -165,7 +165,7 @@ func GetEdbDataTableName(source, subSource int) (tableName string) {
 		tableName = "edb_data_calculate_zdyfx" // 自定义分析->74
 	case utils.DATA_SOURCE_CALCULATE_RJZ: //日均值->75
 		tableName = "edb_data_calculate_rjz"
-	case utils.DATA_SOURCE_GFEX: //广州期货交易所->76
+	case utils.DATA_SOURCE_GFEX: //广州期货交易所->78
 		tableName = "edb_data_gz"
 	case utils.DATA_SOURCE_ICPI: //ICPI消费价格指数->79
 		tableName = "edb_data_icpi"

services/data/edb_info.go

@@ -2547,7 +2547,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)