diff --git a/src/main/java/ru/nbch/credit_tracker/service/UpdateProcessingPackagesService.java b/src/main/java/ru/nbch/credit_tracker/service/UpdateProcessingPackagesService.java index 96498e4..7ee1d9a 100644 --- a/src/main/java/ru/nbch/credit_tracker/service/UpdateProcessingPackagesService.java +++ b/src/main/java/ru/nbch/credit_tracker/service/UpdateProcessingPackagesService.java @@ -58,7 +58,6 @@ public class UpdateProcessingPackagesService { public void run() { acceptedRestore(); processingRestore(); - processingRepeatedRestore(); } private void acceptedRestore() { 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 16d3726..c048ffc 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 @@ -102,6 +102,6 @@ public class PersonServiceV2 { } private boolean checkLength(Id p) { - return ("21".equals(p.getIdType2()) || "21".equals(p.getIdType())) && CTUtil.normalizePassport(p).length() == 10; + return !("21".equals(p.getIdType2()) && "21".equals(p.getIdType())) || CTUtil.normalizePassport(p).length() == 10; } } diff --git a/src/main/java/ru/nbch/credit_tracker/utils/CTUtil.java b/src/main/java/ru/nbch/credit_tracker/utils/CTUtil.java index 9c62e99..1664a42 100644 --- a/src/main/java/ru/nbch/credit_tracker/utils/CTUtil.java +++ b/src/main/java/ru/nbch/credit_tracker/utils/CTUtil.java @@ -77,7 +77,7 @@ public class CTUtil { if (StringUtils.isBlank(value)) { return null; } - if (idType.equals("21") || idType2.equals("21")) { + if ("21".equals(idType) || "21".equals(idType2)) { return value.replaceAll("[^0-9]", ""); } else { return value.replaceAll("[^А-Яа-яA-Za-z0-9]", "");