Merge branch 'feature/eta1.9.7_interval_anaylsis' of eta_server/eta_index_lib into master

controllers/factor_edb_series/factor_edb_series.go

@@ -232,7 +232,9 @@ func (this *FactorEdbSeriesController) ChartRecalculate() {
 	edbInfoIds := make([]int, 0)
 	for _, v := range mappings {
 		seriesIds = append(seriesIds, v.FactorEdbSeriesId)
-		edbInfoIds = append(edbInfoIds, v.EdbInfoId)
+		if v.EdbInfoId > 0 {
+			edbInfoIds = append(edbInfoIds, v.EdbInfoId)
+		}
 	}
 
 	// 获取因子指标及系列信息
@@ -253,12 +255,17 @@ func (this *FactorEdbSeriesController) ChartRecalculate() {
 		}
 	}
 	edbIdItem := make(map[int]*models.EdbInfo)
-	edbItems, e := models.GetEdbInfoByIdList(edbInfoIds)
-	if e != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取因子指标失败, Err: " + e.Error()
-		return
+	edbItems := make([]*models.EdbInfo, 0)
+	var err error
+	if len(edbInfoIds) > 0 {
+		edbItems, err = models.GetEdbInfoByIdList(edbInfoIds)
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取因子指标失败, Err: " + err.Error()
+			return
+		}
 	}
+
 	for _, v := range edbItems {
 		edbIdItem[v.EdbInfoId] = v
 	}

models/factor_edb_series_mapping.go

@@ -168,7 +168,7 @@ func (m *FactorEdbSeriesMapping) Format2Item() (item *FactorEdbSeriesMappingItem
 
 func (m *FactorEdbSeriesMapping) GetItemBySeriesId(seriesId int) (items []*FactorEdbSeriesMapping, err error) {
 	o := orm.NewOrm()
-	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.Cols().FactorEdbSeriesId)
+	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? `, m.TableName(), m.Cols().FactorEdbSeriesId)
 	_, err = o.Raw(sql, seriesId).QueryRows(&items)
 	return
 }