From 674522db91d637d179c16c372d87756ea26fa089 Mon Sep 17 00:00:00 2001
From: Kashiwa <13825170+ksw2000@users.noreply.github.com>
Date: Wed, 21 May 2025 19:21:46 +0800
Subject: [PATCH] fix(time): binding time with empty value (#4103)

* fix: binding time with empty value (#4098)

* refact: simplify null-to-zero filling logic

* test: add test for zeroUnixNanoTime
---
 binding/form_mapping.go      | 10 +++++-----
 binding/form_mapping_test.go | 26 ++++++++++++++++----------
 2 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/binding/form_mapping.go b/binding/form_mapping.go
index 235692d2..c9f3197f 100644
--- a/binding/form_mapping.go
+++ b/binding/form_mapping.go
@@ -397,6 +397,11 @@ func setTimeField(val string, structField reflect.StructField, value reflect.Val
 		timeFormat = time.RFC3339
 	}
 
+	if val == "" {
+		value.Set(reflect.ValueOf(time.Time{}))
+		return nil
+	}
+
 	switch tf := strings.ToLower(timeFormat); tf {
 	case "unix", "unixmilli", "unixmicro", "unixnano":
 		tv, err := strconv.ParseInt(val, 10, 64)
@@ -420,11 +425,6 @@ func setTimeField(val string, structField reflect.StructField, value reflect.Val
 		return nil
 	}
 
-	if val == "" {
-		value.Set(reflect.ValueOf(time.Time{}))
-		return nil
-	}
-
 	l := time.Local
 	if isUTC, _ := strconv.ParseBool(structField.Tag.Get("time_utc")); isUTC {
 		l = time.UTC
diff --git a/binding/form_mapping_test.go b/binding/form_mapping_test.go
index 1277fd5f..45cd9297 100644
--- a/binding/form_mapping_test.go
+++ b/binding/form_mapping_test.go
@@ -183,11 +183,13 @@ func TestMapFormWithTag(t *testing.T) {
 
 func TestMappingTime(t *testing.T) {
 	var s struct {
-		Time      time.Time
-		LocalTime time.Time `time_format:"2006-01-02"`
-		ZeroValue time.Time
-		CSTTime   time.Time `time_format:"2006-01-02" time_location:"Asia/Shanghai"`
-		UTCTime   time.Time `time_format:"2006-01-02" time_utc:"1"`
+		Time             time.Time
+		LocalTime        time.Time `time_format:"2006-01-02"`
+		ZeroValue        time.Time
+		ZeroUnixTime     time.Time `time_format:"unix"`
+		ZeroUnixNanoTime time.Time `time_format:"unixnano"`
+		CSTTime          time.Time `time_format:"2006-01-02" time_location:"Asia/Shanghai"`
+		UTCTime          time.Time `time_format:"2006-01-02" time_utc:"1"`
 	}
 
 	var err error
@@ -195,11 +197,13 @@ func TestMappingTime(t *testing.T) {
 	require.NoError(t, err)
 
 	err = mapForm(&s, map[string][]string{
-		"Time":      {"2019-01-20T16:02:58Z"},
-		"LocalTime": {"2019-01-20"},
-		"ZeroValue": {},
-		"CSTTime":   {"2019-01-20"},
-		"UTCTime":   {"2019-01-20"},
+		"Time":             {"2019-01-20T16:02:58Z"},
+		"LocalTime":        {"2019-01-20"},
+		"ZeroValue":        {},
+		"ZeroUnixTime":     {},
+		"ZeroUnixNanoTime": {},
+		"CSTTime":          {"2019-01-20"},
+		"UTCTime":          {"2019-01-20"},
 	})
 	require.NoError(t, err)
 
@@ -207,6 +211,8 @@ func TestMappingTime(t *testing.T) {
 	assert.Equal(t, "2019-01-20 00:00:00 +0100 CET", s.LocalTime.String())
 	assert.Equal(t, "2019-01-19 23:00:00 +0000 UTC", s.LocalTime.UTC().String())
 	assert.Equal(t, "0001-01-01 00:00:00 +0000 UTC", s.ZeroValue.String())
+	assert.Equal(t, "1970-01-01 00:00:00 +0000 UTC", s.ZeroUnixTime.UTC().String())
+	assert.Equal(t, "1970-01-01 00:00:00 +0000 UTC", s.ZeroUnixNanoTime.UTC().String())
 	assert.Equal(t, "2019-01-20 00:00:00 +0800 CST", s.CSTTime.String())
 	assert.Equal(t, "2019-01-19 16:00:00 +0000 UTC", s.CSTTime.UTC().String())
 	assert.Equal(t, "2019-01-20 00:00:00 +0000 UTC", s.UTCTime.String())