🐞 fix: Fixes the issue with null checks for pointer type fields

sohaha · Jul 16, 2024 · 97226bf · 97226bf
1 parent b1d7c38
commit 97226bf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/ztype/conv.go b/ztype/conv.go
@@ -415,7 +415,7 @@ func (d *Conver) toMapFromStruct(name string, dataVal reflect.Value, val reflect
 			return fmt.Errorf("cannot assign type '%s' to map value field of type '%s'", vTyp, valMap.Type().Elem())
 		}
 
-		if vTyp.Kind() == reflect.Pointer {
+		if vTyp.Kind() == reflect.Pointer && !v.IsZero() {
 			vTyp = v.Elem().Type()
 		}
 

diff --git a/ztype/to_test.go b/ztype/to_test.go
@@ -202,9 +202,12 @@ func TestConv(t *testing.T) {
 		Tags    []string
 		Options map[string]string
 		Name    *string
+		Name2   string
+		Name3   *string
 		Nick    string
 		Date    *_time `json:"d"`
 		Day     ztime.LocalTime
+		Day2    *time.Time
 	}{
 		Name: &name,
 		Nick: name,