From bacea62e452fd87e6716a33d7a445c7e510ee756 Mon Sep 17 00:00:00 2001
From: ialbert <ialbert@mfd.ru>
Date: Mon, 23 Jun 2025 15:33:04 +0300
Subject: [PATCH] =?UTF-8?q?Execution=20=D1=83=D1=81=D0=BB=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=BD=D0=B0=20=D0=BC=D0=B0=D1=80=D0=BA=D0=B5?=
 =?UTF-8?q?=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../builders/ks/KSRepTradesReportBuilder.java      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepTradesReportBuilder.java b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepTradesReportBuilder.java
index acceeabce..1fb62f185 100644
--- a/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepTradesReportBuilder.java
+++ b/clearing-parent/reports-service/src/main/java/ru/spcex/clearing/reports/builders/ks/KSRepTradesReportBuilder.java
@@ -144,14 +144,14 @@ public class KSRepTradesReportBuilder extends CSVReportBuilder<EmptyParams, KSRe
                     // Есть 2 пары Execution, SELL и BUY, статус определяем заранее по SELL и проставляем в BUY
                     if (coverage == CoverageStatus.DEND) {
                         if (execution instanceof ExecutionFond) {
-                            ImdgPredicateBuilder pbRegistry = registryImdg.predicateBuilder();
-                            ImdgPredicate registryPredicate = RegistryCodeSqlBuilder.getInstance(RegistryTradingParams._S_T).buildPredicate(pbRegistry);
+                            ImdgPredicateBuilder pb = registryImdg.predicateBuilder();
+                            ImdgPredicate registryPredicate = RegistryCodeSqlBuilder.getInstance(RegistryTradingParams._S_T).buildPredicate(pb);
                             Collection<Registry> registryCollection = registryImdg.getCollectionObjectsByPredicate(
-                                pbRegistry.and(
-                                    pbRegistry.equals("groupId", groupId),
-                                    pbRegistry.equals("market", execution.getMarket()), //fixme может быть "старый" registry без market
-                                    pbRegistry.equals("companyId", execution.getCompanyId()),
-                                    pbRegistry.in("registryStatus",
+                                pb.and(
+                                    pb.equals("groupId", groupId),
+                                    pb.or(pb.equals("market", execution.getMarket()), pb.isNull("market")),
+                                    pb.equals("companyId", execution.getCompanyId()),
+                                    pb.in("registryStatus",
                                         RegistryStatus.NACC.getKey(),
                                         RegistryStatus.NACK.getKey(),
                                         RegistryStatus.FAIL.getKey(),