diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessTaskController.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessTaskController.java index 7589a5a9b..cd37f8979 100644 --- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessTaskController.java +++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/bpmn/BpmnProcessTaskController.java @@ -33,6 +33,7 @@ import io.swagger.v3.oas.annotations.Operation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.ListUtils; import org.flowable.form.api.FormInfo; +import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; @@ -128,7 +129,11 @@ public class BpmnProcessTaskController extends BasicPopulateAvatarController imp dto.setAttachmentList(tempAttachments); } populateUsersAvatar(dto.getApprover()); - bpmnProcessTaskService.approveTaskWithForm(dto); + if (CollectionUtils.isEmpty(dto.getFormVariables())) { + bpmnProcessTaskService.approveTask(dto); + } else { + bpmnProcessTaskService.approveTaskWithForm(dto); + } return success(true); } @@ -148,6 +153,7 @@ public class BpmnProcessTaskController extends BasicPopulateAvatarController imp /** * 获取当前节点可回退节点选项列表 + * * @param taskId 当前任务id * @return 可选回退节点列表 */