diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilderCommon.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilderCommon.java index 86cfaa538..44cc8b3da 100644 --- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilderCommon.java +++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/ExecutedDealReportBuilderCommon.java @@ -61,6 +61,12 @@ public abstract class ExecutedDealReportBuilderCommon
extends CSVReportBuilde
for (ExecutionFond executionFond : executionFonds) {
try {
Company company = companyImdg.getSingleObjectByID(executionFond.getCompanyId());
+ if (company == null) {
+ log.warn("For execution id = {} company with id = {} not found, execution was skipped",
+ executionFond.getId(),
+ executionFond.getCompanyId());
+ continue;
+ }
if (!WorkflowStatus.Active.equalsByKey(company.getWorkflowStatus())) continue;
STrades sTrade = null;
diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/UnfulfilledDealReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/UnfulfilledDealReportBuilder.java
index 7c2a7c498..213ab2068 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/UnfulfilledDealReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/reports/bp/UnfulfilledDealReportBuilder.java
@@ -74,6 +74,12 @@ public class UnfulfilledDealReportBuilder extends CSVReportBuilder