From 8d8322e009c627438834631c5babbfa9cc6b3522 Mon Sep 17 00:00:00 2001
From: akulikov <akulikov@mfd.ru>
Date: Fri, 29 Dec 2023 16:56:09 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-608 fix

---
 .../builders/ExecutionRegisterReportBuilder.java | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/ExecutionRegisterReportBuilder.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/ExecutionRegisterReportBuilder.java
index c96d32dac..30c074543 100644
--- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/ExecutionRegisterReportBuilder.java
+++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/ExecutionRegisterReportBuilder.java
@@ -72,9 +72,13 @@ public class ExecutionRegisterReportBuilder extends CSVReportBuilder<ExecutionRe
                     entity.setSeller(companyByCounterPartyId.getShortName());
                     entity.setBuyer(companyByCounterPartyId.getShortName());
                 }
-                entity.setSellerCode(companySymbolsByCounterPartyId.getCompanySymbolValue());
+                if (companySymbolsByCounterPartyId != null) {
+                    entity.setSellerCode(companySymbolsByCounterPartyId.getCompanySymbolValue());
+                }
+                if (companySymbolsByCompanyId != null) {
+                    entity.setBuyerCode(companySymbolsByCompanyId.getCompanySymbolValue());
+                }
                 entity.setSellerTkr(input.getCounterPartyTradingClearingRegistry());
-                entity.setBuyerCode(companySymbolsByCompanyId.getCompanySymbolValue());
                 entity.setBuyerTkr(input.getPartyTradingClearingRegistry());
             }
             if (Arrays.asList(Side.SELL.getKey(), MoneyFlowSide.SELL.getKey()).contains(input.getSide().toUpperCase())) {
@@ -82,9 +86,13 @@ public class ExecutionRegisterReportBuilder extends CSVReportBuilder<ExecutionRe
                     entity.setSeller(companyByCompanyId.getShortName());
                     entity.setBuyer(companyByCompanyId.getShortName());
                 }
-                entity.setSellerCode(companySymbolsByCompanyId.getCompanySymbolValue());
+                if (companySymbolsByCompanyId != null) {
+                    entity.setSellerCode(companySymbolsByCompanyId.getCompanySymbolValue());
+                }
+                if (companySymbolsByCounterPartyId != null) {
+                    entity.setBuyerCode(companySymbolsByCounterPartyId.getCompanySymbolValue());
+                }
                 entity.setSeller(input.getPartyTradingClearingRegistry());
-                entity.setBuyerCode(companySymbolsByCounterPartyId.getCompanySymbolValue());
                 entity.setBuyerTkr(input.getCounterPartyTradingClearingRegistry());
             }
         }