fix: back comp for omitnil && omitempty (#255)

TencentCloud · Mar 14, 2024 · 579b857 · 579b857
1 parent daa26f0
commit 579b857
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/tencentcloud/common/json/encode.go b/tencentcloud/common/json/encode.go
@@ -640,7 +640,7 @@ func (se *structEncoder) encode(e *encodeState, v reflect.Value, opts encOpts) {
 	first := true
 	for i, f := range se.fields {
 		fv := fieldByIndex(v, f.index)
-		if !fv.IsValid() || f.omitNil && isNilValue(fv) {
+		if !fv.IsValid() || (f.omitNil || f.omitEmpty) && isNilValue(fv) {
 			continue
 		}
 		if first {
@@ -1043,11 +1043,12 @@ type field struct {
 	nameBytes []byte                 // []byte(name)
 	equalFold func(s, t []byte) bool // bytes.EqualFold or equivalent
 
-	tag     bool
-	index   []int
-	typ     reflect.Type
-	omitNil bool
-	quoted  bool
+	tag       bool
+	index     []int
+	typ       reflect.Type
+	omitEmpty bool
+	omitNil   bool
+	quoted    bool
 }
 
 func fillField(f field) field {
@@ -1160,12 +1161,13 @@ func typeFields(t reflect.Type) []field {
 						name = sf.Name
 					}
 					fields = append(fields, fillField(field{
-						name:    name,
-						tag:     tagged,
-						index:   index,
-						typ:     ft,
-						omitNil: opts.Contains("omitnil"),
-						quoted:  quoted,
+						name:      name,
+						tag:       tagged,
+						index:     index,
+						typ:       ft,
+						omitEmpty: opts.Contains("omitempty"),
+						omitNil:   opts.Contains("omitnil"),
+						quoted:    quoted,
 					}))
 					if count[f.typ] > 1 {
 						// If there were multiple instances, add a second,