|
@@ -723,9 +723,13 @@ public class TaskProcessServiceImpl extends BaseServiceImpl<TaskProcessMapper, T
|
|
|
}
|
|
|
vos.add(vo);
|
|
|
}
|
|
|
-
|
|
|
- vos.sort(Comparator.comparing(TaskPlanInfoVO::getEndTime).reversed());
|
|
|
- vosPage.setRecords(vos);
|
|
|
+ if (vos.size() > 0) {
|
|
|
+ List<TaskPlanInfoVO> collect = vos.stream()
|
|
|
+ .filter(vo -> vo.getEndTime() != null)
|
|
|
+ .sorted(Comparator.comparing(TaskPlanInfoVO::getEndTime).reversed())
|
|
|
+ .collect(Collectors.toList());
|
|
|
+ vosPage.setRecords(collect);
|
|
|
+ }
|
|
|
return vosPage;
|
|
|
}
|
|
|
|