From 2cf52f66f3e7ffd415dbf49eb74aed441871f3a4 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期五, 23 一月 2026 17:52:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/common/utils/EnumUtil.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/common/utils/EnumUtil.java b/src/main/java/com/ruoyi/common/utils/EnumUtil.java
index e17b71e..931fd1c 100644
--- a/src/main/java/com/ruoyi/common/utils/EnumUtil.java
+++ b/src/main/java/com/ruoyi/common/utils/EnumUtil.java
@@ -19,7 +19,7 @@
*/
public static <E extends Enum<E> & BaseEnum> E fromCode(Class<E> enumClass, int code) {
for (E e : enumClass.getEnumConstants()) {
- if ((int)e.getCode() == code) {
+ if (Integer.parseInt(String.valueOf(e.getCode())) == code) {
return e;
}
}
@@ -28,7 +28,7 @@
public static <E extends Enum<E> & BaseEnum> E fromCodeHasNull(Class<E> enumClass, int code) {
for (E e : enumClass.getEnumConstants()) {
- if ((int)e.getCode() == code) {
+ if (Integer.parseInt(String.valueOf(e.getCode())) == code) {
return e;
}
}
@@ -37,7 +37,7 @@
public static <E extends Enum<E> & BaseEnum> E fromCodeHasDefault(Class<E> enumClass, int code,E defaultE) {
for (E e : enumClass.getEnumConstants()) {
- if ((int)e.getCode() == code) {
+ if (Integer.parseInt(String.valueOf(e.getCode())) == code) {
return e;
}
}
@@ -73,7 +73,7 @@
return Arrays.stream(enumClass.getEnumConstants())
.map(e -> {
Map<String, Object> map = new HashMap<>();
- map.put("key", e.getCode());
+ map.put("key", e.getCode().toString());
map.put("value", e.getValue());
return map;
})
--
Gitblit v1.9.3