|
@@ -427,7 +427,8 @@ public class TaskController extends BladeController {
|
|
|
*/
|
|
|
private void integrationMethod(TaskQueryVO queryVO, Map<String,Task> masterTaskMap, Map<String,TaskParallel> parallelMap, List<String> parallelProcessInstanceIds, String status){
|
|
|
//先查询符合条件的流程
|
|
|
- LambdaQueryWrapper<Task> wrapper = Wrappers.<Task>lambdaQuery().eq(Task::getIsDeleted, 0).eq(Task::getProjectId, queryVO.getProjectId());
|
|
|
+ LambdaQueryWrapper<Task> wrapper = Wrappers.<Task>lambdaQuery().eq(Task::getIsDeleted, 0)
|
|
|
+ .eq(Task::getProjectId, queryVO.getProjectId()).eq(StringUtils.isNotBlank(queryVO.getBatch()),Task::getBatch,queryVO.getBatch());
|
|
|
this.integrationMethod(wrapper, queryVO);
|
|
|
|
|
|
//符合条件的集合
|