Pre Merge pull request !882 from DoubleH/6.X

This commit is contained in:
DoubleH 2026-09-04 06:34:47 +00:00 committed by Gitee
commit 7986275284
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -14,7 +14,7 @@ import java.util.Set;
* @author 秋辞未寒
* @date 2024-12-09
*/
public class EnumPatternValidator implements ConstraintValidator<EnumPattern, String> {
public class EnumPatternValidator implements ConstraintValidator<EnumPattern, Object> {
/**
* 枚举允许值集合
@ -42,18 +42,22 @@ public class EnumPatternValidator implements ConstraintValidator<EnumPattern, St
}
/**
* 校验字符串是否在枚举允许值集合内
* 校验输入值是否在枚举允许值集合内
*
* @param value 待校验值
* @param constraintValidatorContext 校验上下文
* @return true 校验通过 false 校验失败
*/
@Override
public boolean isValid(String value, ConstraintValidatorContext constraintValidatorContext) {
if (StringUtils.isBlank(value)) {
public boolean isValid(Object value, ConstraintValidatorContext constraintValidatorContext) {
if (value == null) {
return true;
}
return values.contains(value);
String text = String.valueOf(value);
if (StringUtils.isBlank(text)) {
return true;
}
return values.contains(text);
}
}