From ec71cf9b61a7acd8c0653732c6333bc1583ee27a Mon Sep 17 00:00:00 2001 From: ialbert Date: Wed, 18 Feb 2026 11:18:46 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-931 --- .../TradingClearingRegistryValidationConfig.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/TradingClearingRegistryValidationConfig.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/TradingClearingRegistryValidationConfig.java index 4c992c3e6..4a79ce29e 100644 --- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/TradingClearingRegistryValidationConfig.java +++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/TradingClearingRegistryValidationConfig.java @@ -200,11 +200,11 @@ public class TradingClearingRegistryValidationConfig { Imdg accountImdg = context.obtainMap(IMDGDistributedNames.Map_Account, Account.class); Account account = accountImdg.getSingleObjectByID(validatedObject.getMoneyAccountId()); if (account == null) { // never - return of(AccountError.AccountNotFound, depoAccountId); + return of(AccountError.AccountNotFound, validatedObject.getMoneyAccountId()); } TradingClearingRegistry updateObject = tcrMap.getSingleObjectByID(validatedObject.getId()); if (!Objects.equals(account.getCompanyId(), updateObject.getCompanyId())) { - return of(AccountError.AccountNotFound, depoAccountId); // или UserVerifyDenial + return of(AccountError.AccountNotFound, validatedObject.getMoneyAccountId()); // или UserVerifyDenial } // Проверка использования счёта в других ТКР @@ -216,8 +216,7 @@ public class TradingClearingRegistryValidationConfig { if (existTCR.isEmpty()) { return empty(); } else { - if (account == null && validatedObject.getDepoAccountId() != null) account = accountImdg.getSingleObjectByID(validatedObject.getDepoAccountId()); - return of(AccountError.AccountForTradingClearingRegistryAlreadyUsed, account.getAccount()); + return of(AccountError.AccountForTradingClearingRegistryAlreadyUsed, validatedObject.getDepoAccountId()); } } }