wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update - 调整过滤审批日志的判断

Browse Source
This commit is contained in:
wangli 2024-01-03 11:35:17 +08:00
parent 7a0f623e40
commit 4595470f80
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
workflow-engine-core/src/main/java/cn/axzo/workflow/core/engine/cmd/CustomAbortProcessInstanceCmd.java
View File

@ -20,6 +20,7 @@ import java.util.List;
import java.util.Map;
import java.util.Objects;
import static cn.axzo.workflow.common.constant.BpmnConstants.HIDDEN_ASSIGNEE_ID;
import static cn.axzo.workflow.common.constant.BpmnConstants.INTERNAL_DELETE_PROCESS_FLAG;
import static cn.axzo.workflow.common.constant.BpmnConstants.INTERNAL_END_TENANT_ID;
import static cn.axzo.workflow.common.constant.BpmnConstants.INTERNAL_END_USER_ID;
@ -85,7 +86,7 @@ public class CustomAbortProcessInstanceCmd implements Command<Void>, Serializabl
.forEach(i -> taskService.complete(i.getId()));
}
runtimeService.deleteProcessInstance(processInstanceId, reason);
runtimeService.deleteProcessInstance(processInstanceId, HIDDEN_ASSIGNEE_ID);
// 添加自定义的节点,用于展示最后的操作
CustomTaskHelper.createVirtualTask(commandContext, processInstanceId, "系统终止", "system_abort_node", reason);

1
workflow-engine-core/src/main/java/cn/axzo/workflow/core/service/converter/BpmnHistoricTaskInstanceConverter.java
View File

@ -54,6 +54,7 @@ public interface BpmnHistoricTaskInstanceConverter extends EntityConverter<BpmnH
List<BpmnHistoricTaskInstanceVO> vos = new ArrayList<>();
entities.stream()
.filter(i -> !Objects.equals(i.getAssignee(), HIDDEN_ASSIGNEE_ID))
.filter(i -> !Objects.equals(i.getDeleteReason(), HIDDEN_ASSIGNEE_ID))
.forEach(i -> vos.add(toVo(i)));
return vos;
}