fix:逻辑调整

controllers/base_from_calculate.go

@@ -2142,6 +2142,7 @@ func (this *CalculateController) Calculate() {
 			br.Msg = errMsg
 		}
 		br.ErrMsg = err.Error()
+		return
 	}
 
 	dateStrDataMap, dateList := models.GetDateDataAndDateList(dateDataMap)

models/base_calculate.go

@@ -776,6 +776,12 @@ func (obj BaseCalculate) DownFrequency() (dateDataMap map[time.Time]float64, err
 	edbFrequency := obj.Frequency
 	formula := obj.Formula.(string)
 
+	if !CheckFrequency(obj.FromFrequency, obj.Frequency) {
+		errMsg = "频度异常,不允许低频降频到高频"
+		err = errors.New(errMsg)
+		return
+	}
+
 	// 数据处理
 	var dateArr []time.Time
 	dataMap := make(map[time.Time]*EdbInfoData)
@@ -1226,12 +1232,6 @@ func (obj BaseCalculate) Ljz() (dateDataMap map[time.Time]float64, err error, er
 	dataList := obj.DataList
 	frequency := obj.Frequency         //需要变更的频度
 	fromFrequency := obj.FromFrequency //来源的频度
-
-	if !CheckFrequency(obj.FromFrequency, obj.Frequency) {
-		errMsg = "频度异常,不允许低频降频到高频"
-		err = errors.New(errMsg)
-		return
-	}
 	// 数据处理
 	var isWeekData bool // 是否周度数据，如果是周度数据的话，是需要变频的，最后结果还需要除以7
 	// 周度数据需要先变成日度的