Merge remote-tracking branch 'refs/remotes/origin/master' into feature/payment-apply-bfi-sync

# Conflicts:
#	blade-service/blade-transport/src/main/java/org/springblade/transport/service/impl/CustomerArchiveServiceImpl.java

blade-third-party-api/blade-mk-api/src/main/java/org/springblade/thirdparty/mk/pojo/dto/MKProcessCreateDTO.java

@@ -17,9 +17,14 @@ public class MKProcessCreateDTO implements Serializable {
     @Serial
     private static final long serialVersionUID = 1L;
     /**
-     *  表单实例id，业务id
+     *  表单实例id（传给 MK；由后端生成，前端勿传）
      */
     private String formInstanceId;
+    /**
+     *  业务主键，仅 ERP 内部使用，不传给 MK
+     */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    private String bizId;
     /**
      *  标题
      */
@@ -50,4 +55,9 @@ public class MKProcessCreateDTO implements Serializable {
      */
     @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
     private String bizType;
+    /**
+     *  强制生成新表单实例（审核通过后再次提交），仅 ERP 内部使用，不传给 MK
+     */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    private Boolean forceNewFormInstance;
 }

blade-third-party-api/blade-mk-api/src/main/java/org/springblade/thirdparty/mk/service/impl/MKServiceImpl.java

@@ -323,10 +323,13 @@ public class MKServiceImpl implements IMKService {
             return null;
         }
         String code = codeVO.getCode();
+        // 跳转域名使用 thirdParty.mk.baseUrl（loginUrl 在部分环境未配置会导致拼出相对路径 null/...）
+        AssertUtils.notBlank(properties.getBaseUrl(), "未配置 thirdParty.mk.baseUrl");
+        String mkBaseUrl = StringUtil.removeSuffix(properties.getBaseUrl().trim(), StringPool.SLASH);
         // 审批页面地址
-        String approvalUrl = String.format(APPROVAL_URL_FORMAT, properties.getLoginUrl(), processInstanceId, processInstanceId);
+        String approvalUrl = String.format(APPROVAL_URL_FORMAT, mkBaseUrl, processInstanceId, processInstanceId);
         // sso回调地址
-        return String.format(SSO_CALLBACK_URL_FORMAT, properties.getLoginUrl(), code, UrlUtil.encode(approvalUrl));
+        return String.format(SSO_CALLBACK_URL_FORMAT, mkBaseUrl, code, UrlUtil.encode(approvalUrl));
     }
 
     @Override