From 543e492bf21fd44a8eda18860d9f13cd988a5c73 Mon Sep 17 00:00:00 2001
From: etreschenkov <ETreschenkov@mfd.ru>
Date: Mon, 19 Jan 2026 17:54:48 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/BKI-3217

---
 .../credit_tracker/service/UserPackageService.java    |  4 ++--
 .../credit_tracker/service/indic/PersonServiceV2.java | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/ru/nbch/credit_tracker/service/UserPackageService.java b/src/main/java/ru/nbch/credit_tracker/service/UserPackageService.java
index d7c7be9..a12e6f1 100644
--- a/src/main/java/ru/nbch/credit_tracker/service/UserPackageService.java
+++ b/src/main/java/ru/nbch/credit_tracker/service/UserPackageService.java
@@ -21,7 +21,7 @@ public class UserPackageService {
     }
 
     public boolean isPackageNotUnique(String userId, String packageName) {
-        return userPackageMapper.isPackageNotUnique(userId, packageName);
+        return userPackageMapper.isPackageNotUnique(userId.substring(0, 6), packageName);
     }
 
     public Long registerPackage(String userId, String packageName, List<Integer> signalTypes) {
@@ -63,7 +63,7 @@ public class UserPackageService {
         userPackageMapper.setFidChanged(id);
     }
     public List<UserPackage> findAllPackages(String userId) {
-        return userPackageMapper.findAllPackagesByUserId(userId);
+        return userPackageMapper.findAllPackagesByUserId(userId.substring(0, 6));
     }
 
     public List<UserPackage> findByMemberCodeAndPackageName(String memberCode, String packageName) {
diff --git a/src/main/java/ru/nbch/credit_tracker/service/indic/PersonServiceV2.java b/src/main/java/ru/nbch/credit_tracker/service/indic/PersonServiceV2.java
index 4daf172..16d3726 100644
--- a/src/main/java/ru/nbch/credit_tracker/service/indic/PersonServiceV2.java
+++ b/src/main/java/ru/nbch/credit_tracker/service/indic/PersonServiceV2.java
@@ -41,22 +41,20 @@ public class PersonServiceV2 {
         }
         List<Id> passports = mapper.findPassportData(fids);
 
-        Map<Integer, Id> idByFid = passports.stream()
+        return passports.stream()
             .filter(this::isDUL)
+            .filter(this::checkLength)
             .collect(Collectors.groupingBy(
                 Id::getFid,
                 Collectors.collectingAndThen(
                     Collectors.toList(),
                     docs -> docs.stream()
-                        .filter(p ->
-                            ("21".equals(p.getIdType2()) || "21".equals(p.getIdType()))
-                                && CTUtil.normalizePassport(p).length() == 10)
+                        .filter(p -> "21".equals(p.getIdType2()) || "21".equals(p.getIdType()))
                         .max(byDatesDesc)
                         .or(() -> docs.stream().max(byDatesDesc))
                         .orElse(null)
                 )
             ));
-        return idByFid;
     }
 
     /**
@@ -103,4 +101,7 @@ public class PersonServiceV2 {
                 (idType2 != null && (idType2 >= 1 && idType2 <= 999));
     }
 
+    private boolean checkLength(Id p) {
+        return ("21".equals(p.getIdType2()) || "21".equals(p.getIdType())) && CTUtil.normalizePassport(p).length() == 10;
+    }
 }