Merge branch 'ETA_2.0.5' into debug

controllers/hisugar_data.go

@@ -947,6 +947,7 @@ func (this *TradeCommonController) HisugarIndexData() {
 		edbInfo := edbCodeMap[v.IndexCode]
 		if edbInfo != nil {
 			product.EdbInfoId = edbInfo.EdbInfoId
+			product.EdbExist = 1
 		}
 
 		total := countMap[v.IndexCode]

models/data_manage/base_from_hisugar.go

@@ -283,7 +283,7 @@ func GetHisugarIndexViewListCount(condition string, pars []interface{}) (count i
 // GetHisugarDataViewList 根据指标id获取泛糖科技指标列表
 func GetHisugarDataViewList(indexIds []int) (items []*BaseFromHisugarData, err error) {
 	o := orm.NewOrmUsingDB("data")
-	sql := ` SELECT * FROM base_from_hisugar_data WHERE base_from_hisugar_index_id IN (` + utils.GetOrmInReplace(len(indexIds)) + `)ORDER BY data_time desc  `
+	sql := ` SELECT * FROM base_from_hisugar_data WHERE base_from_hisugar_index_id IN (` + utils.GetOrmInReplace(len(indexIds)) + `) ORDER BY data_time desc  `
 	_, err = o.Raw(sql, indexIds).QueryRows(&items)
 	return
 }