允许混合表格中的日期为空

services/data/excel/mixed_table.go

@@ -731,34 +731,33 @@ func HandleMixTableDateChange(date, conf string) (newDate string, err error) {
 		return
 	}
 
-	if newDate == "" {
-		err = fmt.Errorf("日期为空")
-		return
-	}
-	if len(edbDateConf.DateChange) > 0 {
-		var dateTime time.Time
-		dateTime, err = time.ParseInLocation(utils.FormatDate, newDate, time.Local)
-		if err != nil {
-			err = fmt.Errorf("日期解析失败: %s", err.Error())
-			return
-		}
-		for _, v := range edbDateConf.DateChange {
-			if v.ChangeType == 1 {
-				dateTime = dateTime.AddDate(v.Year, v.Month, v.Day)
-				newDate = dateTime.Format(utils.FormatDate)
-			} else if v.ChangeType == 2 {
-				newDate, err, _ = handleSystemAppointDateT(dateTime, v.FrequencyDay, v.Frequency)
-				if err != nil {
-					return
-				}
-				dateTime, err = time.ParseInLocation(utils.FormatDate, newDate, time.Local)
-				if err != nil {
-					err = fmt.Errorf("日期解析失败: %s", err.Error())
-					return
+	if newDate != "" {
+		if len(edbDateConf.DateChange) > 0 {
+			var dateTime time.Time
+			dateTime, err = time.ParseInLocation(utils.FormatDate, newDate, time.Local)
+			if err != nil {
+				err = fmt.Errorf("日期解析失败: %s", err.Error())
+				return
+			}
+			for _, v := range edbDateConf.DateChange {
+				if v.ChangeType == 1 {
+					dateTime = dateTime.AddDate(v.Year, v.Month, v.Day)
+					newDate = dateTime.Format(utils.FormatDate)
+				} else if v.ChangeType == 2 {
+					newDate, err, _ = handleSystemAppointDateT(dateTime, v.FrequencyDay, v.Frequency)
+					if err != nil {
+						return
+					}
+					dateTime, err = time.ParseInLocation(utils.FormatDate, newDate, time.Local)
+					if err != nil {
+						err = fmt.Errorf("日期解析失败: %s", err.Error())
+						return
+					}
 				}
 			}
 		}
 	}
+
 	return
 }