fix: json tag omitempty convert error (#218)

duke-git · May 14, 2024 · f0235c4 · f0235c4
1 parent 53fa210
commit f0235c4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/maputil/map.go b/maputil/map.go
@@ -6,9 +6,11 @@ package maputil
 
 import (
 	"fmt"
-	"golang.org/x/exp/constraints"
 	"reflect"
 	"sort"
+	"strings"
+
+	"golang.org/x/exp/constraints"
 
 	"github.com/duke-git/lancet/v2/slice"
 )
@@ -377,8 +379,7 @@ func getFieldNameByJsonTag(structObj any, jsonTag string) string {
 	for i := 0; i < s.NumField(); i++ {
 		field := s.Field(i)
 		tag := field.Tag
-		name := tag.Get("json")
-
+		name, _, _ := strings.Cut(tag.Get("json"), ",")
 		if name == jsonTag {
 			return field.Name
 		}

diff --git a/maputil/map_test.go b/maputil/map_test.go
@@ -485,7 +485,7 @@ func TestMapToStruct(t *testing.T) {
 			Name  string   `json:"name"`
 			Age   int      `json:"age"`
 			Phone string   `json:"phone"`
-			Addr  *Address `json:"address"`
+			Addr  *Address `json:"address,omitempty"`
 		}
 
 		Address struct {