fix(util/gconv): #3731 map type name mismatch in switch case statement (

#3732)
gogf · Sep 9, 2024 · 448df14 · 448df14
1 parent 467a5c1
commit 448df14
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/util/gconv/gconv_convert.go b/util/gconv/gconv_convert.go
@@ -266,10 +266,10 @@ func doConvert(in doConvertInput) (convertedValue interface{}) {
 	case "map[string]string":
 		return MapStrStr(in.FromValue)
 
-	case "map[string]interface{}":
+	case "map[string]interface {}":
 		return Map(in.FromValue)
 
-	case "[]map[string]interface{}":
+	case "[]map[string]interface {}":
 		return Maps(in.FromValue)
 
 	case "RawMessage", "json.RawMessage":

diff --git a/util/gconv/gconv_z_unit_issue_test.go b/util/gconv/gconv_z_unit_issue_test.go
@@ -7,6 +7,7 @@
 package gconv_test
 
 import (
+	"fmt"
 	"math/big"
 	"testing"
 	"time"
@@ -366,3 +367,23 @@ func TestIssue3006(t *testing.T) {
 		t.Assert(ff.Val3["val3"], []byte(`{"hello":"world"}`))
 	})
 }
+
+// https://github.com/gogf/gf/issues/3731
+func TestIssue3731(t *testing.T) {
+	type Data struct {
+		Doc map[string]interface{} `json:"doc"`
+	}
+
+	gtest.C(t, func(t *gtest.T) {
+		dataMap := map[string]any{
+			"doc": map[string]any{
+				"craft": nil,
+			},
+		}
+
+		var args Data
+		err := gconv.Struct(dataMap, &args)
+		t.AssertNil(err)
+		t.AssertEQ("<nil>", fmt.Sprintf("%T", args.Doc["craft"]))
+	})
+}