From eb65d42afe7afb050d0e50fca9c4840cd3beafbe Mon Sep 17 00:00:00 2001
From: chengqiang <437004246@qq.com>
Date: Sat, 14 Nov 2020 22:33:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E6=8F=8F=E8=BF=B0,?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=94=99=E8=AF=AF=E5=AD=97=E6=AE=B5=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../extra/validation/BeanValidationResult.java    | 15 ++++++++++++++-
 .../hutool/extra/validation/ValidationUtil.java   |  3 ++-
 .../cn/hutool/extra/validation/package-info.java  |  4 ++--
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/hutool-extra/src/main/java/cn/hutool/extra/validation/BeanValidationResult.java b/hutool-extra/src/main/java/cn/hutool/extra/validation/BeanValidationResult.java
index 73e87eb61..54f9243dd 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/validation/BeanValidationResult.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/validation/BeanValidationResult.java
@@ -80,7 +80,7 @@ public class BeanValidationResult {
 	}
 
 	/**
-	 * 错误消息，包括字段名（字段路径）和消息内容
+	 * 错误消息，包括字段名（字段路径）、消息内容和字段值
 	 */
 	public static class ErrorMessage {
 		/**
@@ -91,6 +91,10 @@ public class BeanValidationResult {
 		 * 错误信息
 		 */
 		private String message;
+		/**
+		 * 错误值
+		 */
+		private Object value;
 
 		public String getPropertyName() {
 			return propertyName;
@@ -108,11 +112,20 @@ public class BeanValidationResult {
 			this.message = message;
 		}
 
+		public Object getValue() {
+			return value;
+		}
+
+		public void setValue(Object value) {
+			this.value = value;
+		}
+
 		@Override
 		public String toString() {
 			return "ErrorMessage{" +
 					"propertyName='" + propertyName + '\'' +
 					", message='" + message + '\'' +
+					", value=" + value +
 					'}';
 		}
 	}
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/validation/ValidationUtil.java b/hutool-extra/src/main/java/cn/hutool/extra/validation/ValidationUtil.java
index 0c0f91a05..cb9a4cd1c 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/validation/ValidationUtil.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/validation/ValidationUtil.java
@@ -98,7 +98,8 @@ public class ValidationUtil {
 			ErrorMessage errorMessage = new ErrorMessage();
 			errorMessage.setPropertyName(constraintViolation.getPropertyPath().toString());
 			errorMessage.setMessage(constraintViolation.getMessage());
-			result.getErrorMessages().add(errorMessage);
+			errorMessage.setValue(constraintViolation.getInvalidValue());
+			result.addErrorMessage(errorMessage);
 		}
 		return result;
 	}
diff --git a/hutool-extra/src/main/java/cn/hutool/extra/validation/package-info.java b/hutool-extra/src/main/java/cn/hutool/extra/validation/package-info.java
index fd0d5f94a..2107f1cc2 100644
--- a/hutool-extra/src/main/java/cn/hutool/extra/validation/package-info.java
+++ b/hutool-extra/src/main/java/cn/hutool/extra/validation/package-info.java
@@ -1,6 +1,6 @@
 /**
- * 基于JSR-303标准的校验工具类，封装了javax.validation的API
+ * 基于JSR-380标准的校验工具类，封装了javax.validation的API
  *
  * @author chengqiang
  */
-package cn.hutool.extra.validation;
\ No newline at end of file
+package cn.hutool.extra.validation;