From 841ad76fe80258500747a6b2f2acf68df955cc0c Mon Sep 17 00:00:00 2001 From: AKurakin Date: Mon, 6 Feb 2023 11:20:37 +0300 Subject: [PATCH] =?UTF-8?q?http://jira.mfd.msk:8088/browse/CLS-189=20fix?= =?UTF-8?q?=20NPE=20PaymentInstructionCreator=20=D0=BA=D0=BE=D0=B3=D0=B4?= =?UTF-8?q?=D0=B0=20payment2.getAddresseeId=20=3D=3D=20null=20-=20=D0=B1?= =?UTF-8?q?=D1=83=D0=B4=D0=B5=D1=82=20warn.=20=D0=9E=D1=81=D0=BD=D0=BE?= =?UTF-8?q?=D0=B2=D0=BD=D0=B0=D1=8F=20=D0=BF=D1=80=D0=B8=D1=87=D0=B8=D0=BD?= =?UTF-8?q?=D0=B0:=20securityId=20=3D=20%s=20and=20companyId=20<>=20%s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clearing/service/builder/PaymentInstructionCreator.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionCreator.java b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionCreator.java index 60dc70007..7409b8516 100644 --- a/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionCreator.java +++ b/clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionCreator.java @@ -412,6 +412,9 @@ public class PaymentInstructionCreator { } protected String selectSymbolValue(Long companyId, CompanySymbol symbol) { + if (companyId == null) { + return null; + } CompanySymbols cSymbol = companySymbolsImdg.getSingleObjectByFieldValues(Map.of( "companyId", companyId, "companySymbol", symbol.getKey())); @@ -423,6 +426,9 @@ public class PaymentInstructionCreator { } protected Account selectAccount(Long companyId, AccountType accountType, Status accountStatus, Allowed processingSign) { + if (companyId == null) { + return null; + } Account account = accountImdg.getSingleObjectByFieldValues(Map.of( "companyId", companyId, "accountType", accountType.getKey(),