From cb49f07b103d945b0bccd9416c80db63efb04051 Mon Sep 17 00:00:00 2001
From: akulikov <akulikov@mfd.ru>
Date: Tue, 9 Jan 2024 15:59:24 +0300
Subject: [PATCH] registry-service: fix report name, fix npe

---
 .../reports/builders/MoneyBalanceRegisterReportBuilder.java     | 2 +-
 .../clearing/registry/reports/builders/XLSXReportBuilder.java   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/MoneyBalanceRegisterReportBuilder.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/MoneyBalanceRegisterReportBuilder.java
index 67d8b6b9d..b44c2fec0 100644
--- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/MoneyBalanceRegisterReportBuilder.java
+++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/MoneyBalanceRegisterReportBuilder.java
@@ -29,7 +29,7 @@ public class MoneyBalanceRegisterReportBuilder extends XLSXReportBuilder<MoneyBa
 
     @Override
     protected String reportName() {
-        return "security_register";
+        return "money_register";
     }
 
     @Override
diff --git a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/XLSXReportBuilder.java b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/XLSXReportBuilder.java
index d274ccfbe..d75bf6eec 100644
--- a/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/XLSXReportBuilder.java
+++ b/clearing-parent/registry-service/src/main/java/ru/spcex/clearing/registry/reports/builders/XLSXReportBuilder.java
@@ -103,6 +103,8 @@ public abstract class XLSXReportBuilder<R extends FileReport, I extends SpcexObj
                         CsvBindByPosition positionAnnotation = field.getAnnotation(CsvBindByPosition.class);
                         if (positionAnnotation == null) continue;
                         field.setAccessible(true);
+                        Object rawValue = field.get(obj);
+                        if (rawValue == null) continue;
                         int position = positionAnnotation.position();
                         Cell cell = xlsxRow.createCell(position);