From 38c9cac5780e857e91d928ac0266f8b6bb804552 Mon Sep 17 00:00:00 2001
From: John Guo <john@johng.cn>
Date: Tue, 7 Feb 2023 11:37:39 +0800
Subject: [PATCH] fix issue #2011 (#2421)

---
 internal/empty/empty.go                       |  2 +-
 os/gstructs/gstructs_field.go                 | 12 +++++-----
 util/gvalid/gvalid_validator_check_struct.go  |  7 ++++++
 .../gvalid_z_unit_feature_recursive_test.go   | 23 +++++++++++++++++++
 4 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/internal/empty/empty.go b/internal/empty/empty.go
index cf581074b..4e42d1c94 100644
--- a/internal/empty/empty.go
+++ b/internal/empty/empty.go
@@ -92,7 +92,7 @@ func IsEmpty(value interface{}) bool {
 		// Common interfaces checks.
 		// =========================
 		if f, ok := value.(iTime); ok {
-			if f == nil {
+			if f == (*time.Time)(nil) {
 				return true
 			}
 			return f.IsZero()
diff --git a/os/gstructs/gstructs_field.go b/os/gstructs/gstructs_field.go
index e70b8bf1d..e1d68603a 100644
--- a/os/gstructs/gstructs_field.go
+++ b/os/gstructs/gstructs_field.go
@@ -84,14 +84,14 @@ func (f *Field) Kind() reflect.Kind {
 // OriginalKind retrieves and returns the original reflect.Kind for Value of Field `f`.
 func (f *Field) OriginalKind() reflect.Kind {
 	var (
-		kind  = f.Value.Kind()
-		value = f.Value
+		reflectType = f.Value.Type()
+		reflectKind = reflectType.Kind()
 	)
-	for kind == reflect.Ptr {
-		value = value.Elem()
-		kind = value.Kind()
+	for reflectKind == reflect.Ptr {
+		reflectType = reflectType.Elem()
+		reflectKind = reflectType.Kind()
 	}
-	return kind
+	return reflectKind
 }
 
 // Fields retrieves and returns the fields of `pointer` as slice.
diff --git a/util/gvalid/gvalid_validator_check_struct.go b/util/gvalid/gvalid_validator_check_struct.go
index 25bf154cc..2b5affa18 100644
--- a/util/gvalid/gvalid_validator_check_struct.go
+++ b/util/gvalid/gvalid_validator_check_struct.go
@@ -252,6 +252,13 @@ func (v *Validator) doCheckStruct(ctx context.Context, object interface{}) Error
 			case reflect.Map, reflect.Struct, reflect.Slice, reflect.Array:
 				// Recursively check attribute slice/map.
 				_, value = gutil.MapPossibleItemByKey(inputParamMap, field.Name())
+				if value == nil {
+					switch field.Kind() {
+					case reflect.Map, reflect.Ptr, reflect.Slice, reflect.Array:
+						// Nothing to do.
+						continue
+					}
+				}
 				v.doCheckValueRecursively(ctx, doCheckValueRecursivelyInput{
 					Value:               value,
 					Kind:                field.OriginalKind(),
diff --git a/util/gvalid/gvalid_z_unit_feature_recursive_test.go b/util/gvalid/gvalid_z_unit_feature_recursive_test.go
index 254b5dc6f..adf56e207 100755
--- a/util/gvalid/gvalid_z_unit_feature_recursive_test.go
+++ b/util/gvalid/gvalid_z_unit_feature_recursive_test.go
@@ -421,3 +421,26 @@ func Test_Issue1921(t *testing.T) {
 		t.Assert(err, "The Size value `10000` must be equal or lesser than 100")
 	})
 }
+
+// https://github.com/gogf/gf/issues/2011
+func Test_Issue2011(t *testing.T) {
+	gtest.C(t, func(t *gtest.T) {
+		type Student struct {
+			Name string `v:"required|min-length:6"`
+			Age  int
+		}
+		type Teacher struct {
+			Student *Student
+		}
+		var (
+			teacher = Teacher{}
+			data    = g.Map{
+				"student": g.Map{
+					"name": "john",
+				},
+			}
+		)
+		err := g.Validator().Assoc(data).Data(teacher).Run(ctx)
+		t.Assert(err, "The Name value `john` length must be equal or greater than 6")
+	})
+}