treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

http://jira.mfd.msk:8088/browse/CLS-189 fix NPE PaymentInstructionCreator когда payment2.getAddresseeId == null - будет warn. Основная причина: securityId = %s and companyId <> %s

Browse source
This commit is contained in:
AKurakin 2023-02-06 11:20:37 +03:00
parent 8415cfd243
commit 841ad76fe8
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
clearing-parent/clearing-service/src/main/java/ru/spcex/clearing/service/builder/PaymentInstructionCreator.java
View file

@ -412,6 +412,9 @@ public class PaymentInstructionCreator {
} }
protected String selectSymbolValue(Long companyId, CompanySymbol symbol) { protected String selectSymbolValue(Long companyId, CompanySymbol symbol) {
if (companyId == null) {
return null;
}
CompanySymbols cSymbol = companySymbolsImdg.getSingleObjectByFieldValues(Map.of( CompanySymbols cSymbol = companySymbolsImdg.getSingleObjectByFieldValues(Map.of(
"companyId", companyId, "companyId", companyId,
"companySymbol", symbol.getKey())); "companySymbol", symbol.getKey()));
@ -423,6 +426,9 @@ public class PaymentInstructionCreator {
} }
protected Account selectAccount(Long companyId, AccountType accountType, Status accountStatus, Allowed processingSign) { protected Account selectAccount(Long companyId, AccountType accountType, Status accountStatus, Allowed processingSign) {
if (companyId == null) {
return null;
}
Account account = accountImdg.getSingleObjectByFieldValues(Map.of( Account account = accountImdg.getSingleObjectByFieldValues(Map.of(
"companyId", companyId, "companyId", companyId,
"accountType", accountType.getKey(), "accountType", accountType.getKey(),