diff --git a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/response/bpmn/process/BpmnProcessInstanceVO.java b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/response/bpmn/process/BpmnProcessInstanceVO.java index 145067dec..6c48c4712 100644 --- a/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/response/bpmn/process/BpmnProcessInstanceVO.java +++ b/workflow-engine-common/src/main/java/cn/axzo/workflow/common/model/response/bpmn/process/BpmnProcessInstanceVO.java @@ -2,6 +2,7 @@ package cn.axzo.workflow.common.model.response.bpmn.process; import cn.axzo.workflow.common.enums.BpmProcessInstanceResultEnum; +import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskDelegateAssigner; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -49,4 +50,7 @@ public class BpmnProcessInstanceVO { @ApiModelProperty(value = "流程最终状态") private String businessStatus; + @ApiModelProperty(value = "发起人信息") + private BpmnTaskDelegateAssigner initiator; + } diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/converter/BpmnProcessInstanceConverter.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/converter/BpmnProcessInstanceConverter.java index 00011982c..a15fac969 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/converter/BpmnProcessInstanceConverter.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/converter/BpmnProcessInstanceConverter.java @@ -1,8 +1,10 @@ package cn.axzo.workflow.core.service.converter; +import cn.axzo.workflow.common.model.request.bpmn.task.BpmnTaskDelegateAssigner; import cn.axzo.workflow.common.model.response.bpmn.process.BpmnProcessDefinitionVO; import cn.axzo.workflow.common.model.response.bpmn.process.BpmnProcessInstanceVO; import org.flowable.engine.history.HistoricProcessInstance; +import org.flowable.variable.api.history.HistoricVariableInstance; import org.mapstruct.Mapper; import org.mapstruct.Mapping; @@ -36,11 +38,12 @@ public interface BpmnProcessInstanceConverter extends EntityConverter processInstanceGraphical(@NotBlank(message = "流程实例 ID 不能为空") @RequestParam String processInstanceId, - @NotBlank(message = "租户不能为空") @RequestParam String tenantId) { - return success(bpmnProcessInstanceService.getProcessInstanceGraphical(processInstanceId, - tenantId)); + @Nullable @RequestParam(required = false) String tenantId) { + return success(bpmnProcessInstanceService.getProcessInstanceGraphical(processInstanceId, tenantId)); } /**