diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/UserTaskJsonConverter.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/UserTaskJsonConverter.java index 45f7038fb..c504e1c18 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/UserTaskJsonConverter.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/converter/json/UserTaskJsonConverter.java @@ -439,15 +439,15 @@ public class UserTaskJsonConverter extends AbstractBpmnJsonConverter { case within_the_project_construction_units: throw new WorkflowEngineException(CONVERTOR_COMMON_ERROR, "身份不支持“项目内参建单位的企业身份”选项"); case specified_org: - checkCascadeConfig(property, "身份“审批单指定的末级组织”"); + checkCascadeConfig(property, "身份“审批单指定的末级组织”", false); addCascadeConfig(property, approverSpecifyElement, false); break; case initiator: - checkCascadeConfig(property, "身份“审批单发起人”"); + checkCascadeConfig(property, "身份“审批单发起人”", false); addCascadeConfig(property, approverSpecifyElement, false); break; case pre_node_approver: - checkCascadeConfig(property, "身份“上节点审批人”"); + checkCascadeConfig(property, "身份“上节点审批人”", false); addCascadeConfig(property, approverSpecifyElement, false); break; default: @@ -622,12 +622,15 @@ public class UserTaskJsonConverter extends AbstractBpmnJsonConverter { } } - public static void checkCascadeConfig(BpmnJsonNodeProperty property, String tips) { + checkCascadeConfig(property, tips, true); + } + + public static void checkCascadeConfig(BpmnJsonNodeProperty property, String tips, boolean containsRangeUnit) { if (Objects.isNull(property.getApproverSpecifyRangeOrgLimit())) { throw new WorkflowEngineException(CONVERTOR_COMMON_ERROR, tips + "缺少级联组织配置"); } - if (Objects.isNull(property.getApproverSpecifyRangeUnit())) { + if (Objects.isNull(property.getApproverSpecifyRangeUnit()) && containsRangeUnit) { throw new WorkflowEngineException(CONVERTOR_COMMON_ERROR, tips + "缺少级联配置"); } }