From 8833818a01f969dfe726942d5718db64bf58c094 Mon Sep 17 00:00:00 2001
From: ialbert <ialbert@mfd.ru>
Date: Mon, 17 Jun 2024 14:25:06 +0300
Subject: [PATCH] SDF54 sbanknam1/sclientn1

---
 .../ru/spcex/clearing/service/Sdf54Creator.java | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/Sdf54Creator.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/Sdf54Creator.java
index dfe64eb0a..8d25bccbb 100644
--- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/Sdf54Creator.java
+++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/Sdf54Creator.java
@@ -86,9 +86,12 @@ public class Sdf54Creator {
         Company prcCmp = companyImdg.getSingleObjectByID(Sender.Prc.getId());
         String senderSbankName = "";
         if (prcCmp != null) {
-            senderSbankName = prcCmp.getShortName();
-            if (!LocaleUtil.isRus(locale) && prcCmp.getProfile() != null) {
+            if (LocaleUtil.isRus(locale)) {
+                senderSbankName = prcCmp.getShortName();
+            } else if (prcCmp.getProfile() != null) {
                 senderSbankName = prcCmp.getProfile().getShortNameEng();
+            } else {
+                senderSbankName = "";
             }
         }
         SpecifUtil.fillSegmentsBy35Symbols(senderSbankName,
@@ -175,7 +178,15 @@ public class Sdf54Creator {
         {
             Company company1 = companyImdg.getSingleObjectByID(Sender.One.getId());
             if (company1 != null) { // "АО СПВБ" company.shortName[id = 1]
-                SpecifUtil.fillSegmentsBy35Symbols(company1.getShortName(),
+                String sclientn;
+                if (LocaleUtil.isRus(locale)) {
+                    sclientn = company1.getShortName();
+                } else if (company1.getProfile() != null) {
+                    sclientn = company1.getProfile().getShortNameEng();
+                } else {
+                    sclientn = "";
+                }
+                SpecifUtil.fillSegmentsBy35Symbols(sclientn,
                         sDf54::setSclientn1,
                         sDf54::setSclientn2,
                         sDf54::setSclientn3,