..

services/data/range_analysis/chart_info.go

@@ -517,9 +517,13 @@ func GetChartDataByEdbInfoList(chartInfoId int, dateType, startYear int, startDa
 			}
 			var condition string
 			var pars []interface{}
-			condition = " edb_info_id in (" + utils.GetOrmInReplace(len(edbIds)) + ") "
+			condition = " AND edb_info_id in (" + utils.GetOrmInReplace(len(edbIds)) + ") "
 			pars = append(pars, edbIds)
-			count, _ := data_manage.GetEdbInfoCountByCondition(condition, pars)
+			count, e := data_manage.GetEdbInfoCountByCondition(condition, pars)
+			if e != nil {
+				err = fmt.Errorf("获取区间计算图表, 指标信息失败, Err:" + e.Error())
+				return
+			}
 			if count > 0 {
 				// 查询是否已经生成指标
 				dataResp.ConfigEdbNum = len(multipleGraphConfigEdbMappingList)
@@ -658,7 +662,11 @@ func GetChartDataByEdbInfoListBySeries(chartInfoId int, dateType, startYear int,
 			var pars []interface{}
 			condition = " edb_info_id in (" + utils.GetOrmInReplace(len(edbIds)) + ") "
 			pars = append(pars, edbIds)
-			count, _ := data_manage.GetEdbInfoCountByCondition(condition, pars)
+			count, e := data_manage.GetEdbInfoCountByCondition(condition, pars)
+			if e != nil {
+				err = fmt.Errorf("获取区间计算图表, 指标信息失败, Err:" + e.Error())
+				return
+			}
 			if count > 0 {
 				// 查询是否已经生成指标
 				dataResp.ConfigEdbNum = len(multipleGraphConfigEdbMappingList)