From fb813230320d1aa7dbd8b97079d58dd08ddc6126 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Fri, 29 Aug 2025 18:36:57 +0800 Subject: [PATCH] =?UTF-8?q?feat(REQ-4418)=20-=20=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AB=AF=E4=B8=8E=E5=AE=A2=E6=88=B7=E7=AB=AF?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E4=B8=8D=E4=B8=80=E8=87=B4=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/axzo/workflow/common/enums/AdminDataSource.java | 2 +- .../main/java/cn/axzo/workflow/common/enums/AdminRoleType.java | 2 +- .../main/java/cn/axzo/workflow/common/enums/AdminTypeEnum.java | 2 +- .../java/cn/axzo/workflow/common/enums/BusinessTypeEnum.java | 2 +- .../main/java/cn/axzo/workflow/common/enums/FileTypeEnum.java | 2 +- .../main/java/cn/axzo/workflow/common/enums/VarTypeEnum.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/AdminDataSource.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/AdminDataSource.java index d94346c11..174dcc73a 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/AdminDataSource.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/AdminDataSource.java @@ -34,7 +34,7 @@ public enum AdminDataSource { return UNKNOWN; } return Arrays.stream(AdminDataSource.values()) - .filter(v -> v.getType().equalsIgnoreCase(value)) + .filter(v -> v.getType().equalsIgnoreCase(value) || v.name().equalsIgnoreCase(value)) .findFirst() .orElse(UNKNOWN); } diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/AdminRoleType.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/AdminRoleType.java index b6a25a0d6..70125e724 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/AdminRoleType.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/AdminRoleType.java @@ -35,7 +35,7 @@ public enum AdminRoleType { return UNKNOWN; } return Arrays.stream(AdminRoleType.values()) - .filter(v -> v.getType().equalsIgnoreCase(value)) + .filter(v -> v.getType().equalsIgnoreCase(value) || v.name().equalsIgnoreCase(value)) .findFirst() .orElse(UNKNOWN); } diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/AdminTypeEnum.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/AdminTypeEnum.java index 6542d9422..9aef9d139 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/AdminTypeEnum.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/AdminTypeEnum.java @@ -37,7 +37,7 @@ public enum AdminTypeEnum { return UNKNOWN; } return Arrays.stream(AdminTypeEnum.values()) - .filter(v -> v.getType().equalsIgnoreCase(value)) + .filter(v -> v.getType().equalsIgnoreCase(value) || v.name().equalsIgnoreCase(value)) .findFirst() .orElse(UNKNOWN); } diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BusinessTypeEnum.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BusinessTypeEnum.java index 72599fa4c..a53afbe9e 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BusinessTypeEnum.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/BusinessTypeEnum.java @@ -34,7 +34,7 @@ public enum BusinessTypeEnum { return UNKNOWN; } return Arrays.stream(values()) - .filter(v -> v.getType().equalsIgnoreCase(value)) + .filter(v -> v.getType().equalsIgnoreCase(value) || v.name().equalsIgnoreCase(value)) .findFirst() .orElse(UNKNOWN); } diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/FileTypeEnum.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/FileTypeEnum.java index 93051cb14..6de56e0fe 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/FileTypeEnum.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/FileTypeEnum.java @@ -47,7 +47,7 @@ public enum FileTypeEnum { return UNKNOWN; } return Arrays.stream(FileTypeEnum.values()) - .filter(e -> e.getType().equalsIgnoreCase(value)) + .filter(e -> e.getType().equalsIgnoreCase(value) || e.name().equalsIgnoreCase(value)) .findFirst() .orElse(UNKNOWN); } diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/VarTypeEnum.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/VarTypeEnum.java index 009bf873f..95249b8bc 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/VarTypeEnum.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/enums/VarTypeEnum.java @@ -38,7 +38,7 @@ public enum VarTypeEnum { return UNKNOWN; } return Arrays.stream(values()) - .filter(e -> e.getType().equalsIgnoreCase(value)) + .filter(e -> e.getType().equalsIgnoreCase(value) || e.name().equalsIgnoreCase(value)) .findFirst() .orElse(UNKNOWN); }