|
|
@ -692,8 +692,10 @@ public class ActTaskServiceImpl implements IActTaskService {
|
|
|
|
MultiInstanceVo multiInstance = WorkflowUtils.isMultiInstance(task.getProcessDefinitionId(), task.getTaskDefinitionKey());
|
|
|
|
MultiInstanceVo multiInstance = WorkflowUtils.isMultiInstance(task.getProcessDefinitionId(), task.getTaskDefinitionKey());
|
|
|
|
if (multiInstance == null && taskList.size() > 1) {
|
|
|
|
if (multiInstance == null && taskList.size() > 1) {
|
|
|
|
List<Task> tasks = StreamUtils.filter(taskList, e -> !e.getTaskDefinitionKey().equals(task.getTaskDefinitionKey()));
|
|
|
|
List<Task> tasks = StreamUtils.filter(taskList, e -> !e.getTaskDefinitionKey().equals(task.getTaskDefinitionKey()));
|
|
|
|
|
|
|
|
if (CollUtil.isNotEmpty(tasks)) {
|
|
|
|
actHiTaskinstMapper.deleteBatchIds(StreamUtils.toList(tasks, Task::getId));
|
|
|
|
actHiTaskinstMapper.deleteBatchIds(StreamUtils.toList(tasks, Task::getId));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
List<HistoricTaskInstance> instanceList = QueryUtils.hisTaskInstanceQuery(processInstanceId).finished().orderByHistoricTaskInstanceEndTime().desc().list();
|
|
|
|
List<HistoricTaskInstance> instanceList = QueryUtils.hisTaskInstanceQuery(processInstanceId).finished().orderByHistoricTaskInstanceEndTime().desc().list();
|
|
|
|