From 40779be3c41f308730716f6adf1b4095993eebaa Mon Sep 17 00:00:00 2001
From: rays <1615175118@qq.com>
Date: Sat, 19 Jun 2021 16:17:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=94=AF=E4=B8=80=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=A0=A1=E9=AA=8C=E5=80=BC=E7=B1=BB=E5=9E=8B=E4=B8=BA?=
 =?UTF-8?q?Object?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kernel/validator/api/pojo/UniqueValidateParam.java    | 2 +-
 .../api/validators/unique/TableUniqueValueValidator.java  | 8 ++++----
 .../unique/service/TableUniqueValueService.java           | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/api/pojo/UniqueValidateParam.java b/kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/api/pojo/UniqueValidateParam.java
index 17399c029..029e7401c 100644
--- a/kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/api/pojo/UniqueValidateParam.java
+++ b/kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/api/pojo/UniqueValidateParam.java
@@ -50,7 +50,7 @@ public class UniqueValidateParam {
     /**
      * 被参数校验时候的字段的值
      */
-    String value;
+    Object value;
 
     /**
      * 校验时，是否排除当前的记录
diff --git a/kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/api/validators/unique/TableUniqueValueValidator.java b/kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/api/validators/unique/TableUniqueValueValidator.java
index e4ba80b38..0b5dccb95 100644
--- a/kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/api/validators/unique/TableUniqueValueValidator.java
+++ b/kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/api/validators/unique/TableUniqueValueValidator.java
@@ -42,7 +42,7 @@ import javax.validation.ConstraintValidatorContext;
  * @author fengshuonan
  * @date 2020/11/4 14:39
  */
-public class TableUniqueValueValidator implements ConstraintValidator<TableUniqueValue, String> {
+public class TableUniqueValueValidator implements ConstraintValidator<TableUniqueValue, Object> {
 
     /**
      * 表名称，例如 sys_user
@@ -89,7 +89,7 @@ public class TableUniqueValueValidator implements ConstraintValidator<TableUniqu
     }
 
     @Override
-    public boolean isValid(String fieldValue, ConstraintValidatorContext context) {
+    public boolean isValid(Object fieldValue, ConstraintValidatorContext context) {
 
         if (ObjectUtil.isNull(fieldValue)) {
             return true;
@@ -120,7 +120,7 @@ public class TableUniqueValueValidator implements ConstraintValidator<TableUniqu
      * @author fengshuonan
      * @date 2020/8/17 21:55
      */
-    private UniqueValidateParam createAddParam(String fieldValue) {
+    private UniqueValidateParam createAddParam(Object fieldValue) {
         return UniqueValidateParam.builder()
                 .tableName(tableName)
                 .columnName(columnName)
@@ -137,7 +137,7 @@ public class TableUniqueValueValidator implements ConstraintValidator<TableUniqu
      * @author fengshuonan
      * @date 2020/8/17 21:56
      */
-    private UniqueValidateParam createEditParam(String fieldValue) {
+    private UniqueValidateParam createEditParam(Object fieldValue) {
 
         // 获取请求字段中id的值
         Dict requestParam = RequestParamContext.get();
diff --git a/kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/api/validators/unique/service/TableUniqueValueService.java b/kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/api/validators/unique/service/TableUniqueValueService.java
index fdd43ea18..90d994572 100644
--- a/kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/api/validators/unique/service/TableUniqueValueService.java
+++ b/kernel-d-validator/validator-api/src/main/java/cn/stylefeng/roses/kernel/validator/api/validators/unique/service/TableUniqueValueService.java
@@ -24,6 +24,7 @@
  */
 package cn.stylefeng.roses.kernel.validator.api.validators.unique.service;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.stylefeng.roses.kernel.db.api.DbOperatorApi;
 import cn.stylefeng.roses.kernel.db.api.context.DbOperatorContext;
@@ -130,7 +131,7 @@ public class TableUniqueValueService {
         if (StrUtil.isBlank(uniqueValidateParam.getColumnName())) {
             throw new ParamValidateException(ValidatorExceptionEnum.TABLE_UNIQUE_VALIDATE_ERROR, "@TableUniqueValue注解上columnName属性为空");
         }
-        if (StrUtil.isBlank(uniqueValidateParam.getValue())) {
+        if (ObjectUtil.isEmpty(uniqueValidateParam.getValue())) {
             throw new ParamValidateException(ValidatorExceptionEnum.TABLE_UNIQUE_VALIDATE_ERROR, "@TableUniqueValue被校验属性的值为空");
         }
     }