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

# Conflicts:
#	controllers/base_from_predict_calculate.go
#	utils/constants.go

controllers/base_from_calculate.go

@@ -584,7 +584,7 @@ func (this *CalculateController) BatchSave() {
 
 	// 来源指标
 	var fromEdbInfo *models.EdbInfo
-	if req.FromEdbInfoId > 0 {
+	if fromEdbInfoId > 0 {
 		fromEdbInfo, err = models.GetEdbInfoById(fromEdbInfoId)
 		if err != nil {
 			br.Msg = "获取指标信息失败"

controllers/base_from_predict_calculate.go

@@ -647,6 +647,11 @@ func (this *PredictCalculateController) CalculateBatchSave() {
 		nhccDate.StartDate = startDate
 		nhccDate.EndDate = endDate
 	}
+	if err != nil {
+		br.Msg = "获取指标信息失败"
+		br.ErrMsg = "获取指标信息失败:Err:" + err.Error()
+		return
+	}
 
 	if req.Source == utils.DATA_SOURCE_PREDICT_CALCULATE_TBZ {
 		if req.EdbInfoId <= 0 {