feat(REQ-4418) - 调整协助转换逻辑
This commit is contained in:
parent
27c5da93aa
commit
3d8338d42d
@ -439,15 +439,15 @@ public class UserTaskJsonConverter extends AbstractBpmnJsonConverter<UserTask> {
|
||||
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<UserTask> {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
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 + "缺少级联配置");
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user