update StructToJSONTagtringMap

xurwxj · Jun 16, 2021 · a29245a · a29245a
1 parent f70b74a
commit a29245a
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/base/convert.go b/base/convert.go
@@ -114,11 +114,19 @@ func StructToJSONTagtringMap(item interface{}) (res map[string]string) {
 			field := reflectValue.Field(i).String()
 			if v.Field(i).Type.Kind() == reflect.String {
 				res[tag] = field
+			} else if v.Field(i).Type.Kind() == reflect.Struct {
+				for t, tv := range StructToJSONTagtringMap(reflectValue.Field(i).Interface()) {
+					res[t] = tv
+				}
 			} else {
-				res = nil
+				continue
 			}
 		} else {
-			res = nil
+			if v.Field(i).Type.Kind() == reflect.Struct {
+				for t, tv := range StructToJSONTagtringMap(reflectValue.Field(i).Interface()) {
+					res[t] = tv
+				}
+			}
 		}
 	}
 	return