This commit is contained in:
parent
c32d430483
commit
52d526757b
3 changed files with 2 additions and 3 deletions
|
|
@ -58,7 +58,6 @@ public class UpdateProcessingPackagesService {
|
||||||
public void run() {
|
public void run() {
|
||||||
acceptedRestore();
|
acceptedRestore();
|
||||||
processingRestore();
|
processingRestore();
|
||||||
processingRepeatedRestore();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private void acceptedRestore() {
|
private void acceptedRestore() {
|
||||||
|
|
|
||||||
|
|
@ -102,6 +102,6 @@ public class PersonServiceV2 {
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean checkLength(Id p) {
|
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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -77,7 +77,7 @@ public class CTUtil {
|
||||||
if (StringUtils.isBlank(value)) {
|
if (StringUtils.isBlank(value)) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
if (idType.equals("21") || idType2.equals("21")) {
|
if ("21".equals(idType) || "21".equals(idType2)) {
|
||||||
return value.replaceAll("[^0-9]", "");
|
return value.replaceAll("[^0-9]", "");
|
||||||
} else {
|
} else {
|
||||||
return value.replaceAll("[^А-Яа-яA-Za-z0-9]", "");
|
return value.replaceAll("[^А-Яа-яA-Za-z0-9]", "");
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue