From b1badca062e9f3d22398299247cca8ff191414da Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期二, 10 十二月 2024 17:34:50 +0800
Subject: [PATCH] !607 add 新增 validation支持枚举校验 Merge pull request !607 from 秋辞未寒/dev
---
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPatternValidator.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPatternValidator.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPatternValidator.java
index 451dc71..0e748c0 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPatternValidator.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPatternValidator.java
@@ -1,6 +1,7 @@
package org.dromara.common.core.validate.enumd;
import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.core.utils.reflect.ReflectUtils;
import jakarta.validation.ConstraintValidator;
import jakarta.validation.ConstraintValidatorContext;
import jakarta.validation.ValidationException;
@@ -26,10 +27,11 @@
public boolean isValid(String value, ConstraintValidatorContext constraintValidatorContext) {
try {
if (StringUtils.isNotBlank(value)) {
- Class<? extends ValidateEnum> type = annotation.type();
- ValidateEnum[] constants = type.getEnumConstants();
- for (ValidateEnum e : constants) {
- if (e.validate(value)) {
+ Class<?> type = annotation.type();
+ String fieldName = annotation.fieldName();
+ Object[] enumConstants = type.getEnumConstants();
+ for (Object e : enumConstants) {
+ if (value.equals(ReflectUtils.invokeGetter(e, fieldName))) {
return true;
}
}
--
Gitblit v1.9.3