From 4821902fdc73052b56a0b39ebe60e0c7287b254e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=8B=E8=BE=9E=E6=9C=AA=E5=AF=92?= <545073804@qq.com>
Date: Mon, 9 Dec 2024 10:16:49 +0000
Subject: [PATCH] =?UTF-8?q?update=20=E6=9B=B4=E6=96=B0=20=E6=9E=9A?=
 =?UTF-8?q?=E4=B8=BE=E6=A0=A1=E9=AA=8C=E9=80=9A=E8=BF=87=E6=9E=9A=E4=B8=BE?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=9A=84getter=E6=96=B9=E6=B3=95=E5=8F=96?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 秋辞未寒 <545073804@qq.com>
---
 .../dromara/common/core/validate/enumd/EnumPattern.java    | 7 ++++---
 .../common/core/validate/enumd/EnumPatternValidator.java   | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPattern.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPattern.java
index 35f7ecbe3..c31c7703c 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPattern.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/validate/enumd/EnumPattern.java
@@ -9,7 +9,7 @@ import static java.lang.annotation.ElementType.*;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 /**
- * 自定义枚举校验注解
+ * 自定义枚举校验
  *
  * @author 秋辞未寒
  * @date 2024-12-09
@@ -27,9 +27,10 @@ public @interface EnumPattern {
     Class<? extends Enum> type() default Enum.class;
 
     /**
-     * 枚举类型校验值判断方法
+     * 枚举类型校验值字段名称
+     * TODO 需确保该字段实现了 getter 方法
      */
-    String method() default "getCode";
+    String fieldName() default "code";
 
     String message() default "输入值不在枚举范围内";
 
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 af87225a6..0e748c0a4 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
@@ -28,10 +28,10 @@ public class EnumPatternValidator implements ConstraintValidator<EnumPattern, St
         try {
             if (StringUtils.isNotBlank(value)) {
                 Class<?> type = annotation.type();
+                String fieldName = annotation.fieldName();
                 Object[] enumConstants = type.getEnumConstants();
-                Method method = ReflectUtils.getMethod(type, annotation.method());
                 for (Object e : enumConstants) {
-                    if (value.equals(method.invoke(e))) {
+                    if (value.equals(ReflectUtils.invokeGetter(e, fieldName))) {
                         return true;
                     }
                 }