diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepTradesReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepTradesReportBuilder.java index acceeabce..1fb62f185 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepTradesReportBuilder.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepTradesReportBuilder.java @@ -144,14 +144,14 @@ public class KSRepTradesReportBuilder extends CSVReportBuilder registryCollection = registryImdg.getCollectionObjectsByPredicate( - pbRegistry.and( - pbRegistry.equals("groupId", groupId), - pbRegistry.equals("market", execution.getMarket()), //fixme может быть "старый" registry без market - pbRegistry.equals("companyId", execution.getCompanyId()), - pbRegistry.in("registryStatus", + pb.and( + pb.equals("groupId", groupId), + pb.or(pb.equals("market", execution.getMarket()), pb.isNull("market")), + pb.equals("companyId", execution.getCompanyId()), + pb.in("registryStatus", RegistryStatus.NACC.getKey(), RegistryStatus.NACK.getKey(), RegistryStatus.FAIL.getKey(),