From 63bd1bae6ec13391ef498dc7430fee920c45778e Mon Sep 17 00:00:00 2001
From: etreschenkov <ETreschenkov@mfd.ru>
Date: Fri, 22 May 2026 09:43:16 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-1032

---
 .../config/validation/ClientCodeValidationConfig.java      | 2 +-
 .../validation/BackendClientCodeValidationRule.java        | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/ClientCodeValidationConfig.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/ClientCodeValidationConfig.java
index 1b795ee56..f7385a0db 100644
--- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/ClientCodeValidationConfig.java
+++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/config/validation/ClientCodeValidationConfig.java
@@ -117,7 +117,7 @@ public class ClientCodeValidationConfig {
                     Account.class,
                     AccountError.RequiredFieldEmpty,
                     AccountError.AccountNotFound,
-                    true,
+                    false,
                     acc -> Objects.equals(context.getValidatedObject().getCompanyId(), acc.getCompanyId())
                         ? null : AccountError.AccountNotFound
                 ),
diff --git a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/validation/BackendClientCodeValidationRule.java b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/validation/BackendClientCodeValidationRule.java
index b78f2f0d1..7f4b35960 100644
--- a/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/validation/BackendClientCodeValidationRule.java
+++ b/clearing-parent/account-service/src/main/java/ru/spcex/clearing/account/validation/BackendClientCodeValidationRule.java
@@ -43,7 +43,9 @@ public enum BackendClientCodeValidationRule implements IValidationRule<ImdgValid
             ClientCodeNewRequest validatedObject = context.getValidatedObject();
             List<Long> currencyIds = validatedObject.getCurrencyAccountList();
             Long moneyAccountId = validatedObject.getMoneyAccountId();
-
+            if (moneyAccountId == null) {
+                return empty();
+            }
             Imdg<TradingClearingRegistry> tradingClearingRegistryImdg =
                 context.obtainMap(IMDGDistributedNames.Map_TradingClearingRegistry, TradingClearingRegistry.class);
             Imdg<TradingClearingRegistryList> tradingClearingRegistryListImdg =
@@ -58,6 +60,9 @@ public enum BackendClientCodeValidationRule implements IValidationRule<ImdgValid
                 return of(AccountError.TradingClearingRegistryAlreadyExist);
             }
 
+            if (currencyIds == null || currencyIds.isEmpty()) {
+                return empty();
+            }
             for (Long id : currencyIds) {
                 TradingClearingRegistryList tcrList = tradingClearingRegistryListImdg.getFirstObjectByFieldValues(
                     Map.of(