diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/util/Util.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/util/Util.java index 9ad1d2551..8ed0e6696 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/util/Util.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/util/Util.java @@ -32,7 +32,9 @@ public class Util { } } - plannerMap.values().stream().filter((x) -> x.getClearingDate().isEqual(currentDate)).forEach((x) -> { + plannerMap.values().stream() + .filter(x -> x.getTaskStatus() != null) + .filter((x) -> x.getClearingDate() == null || x.getClearingDate().isEqual(currentDate)).forEach((x) -> { if (x.getTaskStatus().equalsIgnoreCase("ACTV")) { listOfPlannerAllToday.add(createPlannerAllTodayFromPlanner(x)); }