|
|
@@ -1309,6 +1309,16 @@ public class TodoCenterManage { |
|
|
|
.asc() |
|
|
|
.list(); |
|
|
|
if(CollUtil.isEmpty(tasks)){ |
|
|
|
//如果此子单位为空 那就直接再查下 他的其它任务 |
|
|
|
List<Task> currentTasks = taskService.createTaskQuery() |
|
|
|
.processInstanceId(instance.getId()) |
|
|
|
.taskAssignee(employeeCode) |
|
|
|
.orderByTaskCreateTime() |
|
|
|
.asc() |
|
|
|
.list(); |
|
|
|
if(CollUtil.isNotEmpty(currentTasks)){ |
|
|
|
return currentTasks.get(0).getId(); |
|
|
|
} |
|
|
|
return taskId; |
|
|
|
} |
|
|
|
return tasks.get(0).getId(); |
|
|
|