Merge branch 'dev' into test

zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/enums/integration/IWorkSyncEntityTypeEnum.java

@@ -1,5 +1,10 @@
 package com.zt.plat.module.system.enums.integration;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+import java.util.Locale;
+
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -15,6 +20,7 @@ public enum IWorkSyncEntityTypeEnum {
     JOB_TITLE("jobTitle", "岗位"),
     USER("user", "人员");
 
+    @JsonValue
     private final String code;
     private final String label;
 
@@ -29,4 +35,17 @@ public enum IWorkSyncEntityTypeEnum {
         }
         return null;
     }
+
+    @JsonCreator(mode = JsonCreator.Mode.DELEGATING)
+    public static IWorkSyncEntityTypeEnum fromJson(String code) {
+        IWorkSyncEntityTypeEnum value = fromCode(code);
+        if (value != null || code == null) {
+            return value;
+        }
+        try {
+            return IWorkSyncEntityTypeEnum.valueOf(code.trim().toUpperCase(Locale.ROOT));
+        } catch (IllegalArgumentException ex) {
+            return null;
+        }
+    }
 }

zt-module-system/zt-module-system-server/src/main/java/com/zt/plat/module/system/service/integration/iwork/IWorkIntegrationErrorCodeConstants.java

@@ -17,5 +17,5 @@ public interface IWorkIntegrationErrorCodeConstants {
     ErrorCode IWORK_OPERATOR_USER_MISSING = new ErrorCode(1_010_200_007, "缺少 iWork 操作人用户编号");
     ErrorCode IWORK_WORKFLOW_ID_MISSING = new ErrorCode(1_010_200_008, "缺少 iWork 流程模板编号");
     ErrorCode IWORK_ORG_IDENTIFIER_MISSING = new ErrorCode(1_010_200_009, "iWork 人力组织接口缺少认证标识");
-    ErrorCode IWORK_ORG_REMOTE_FAILED = new ErrorCode(1_010_200_010, "iWork 人力组织接口请求失败");
+    ErrorCode IWORK_ORG_REMOTE_FAILED = new ErrorCode(1_010_200_010, "iWork 人力组织接口请求失败{}");
 }