From a7fd8dc0ab56d3fd6440433b86c90e98ea16ccfe Mon Sep 17 00:00:00 2001 From: AKurakin Date: Thu, 1 Jun 2023 18:56:32 +0300 Subject: [PATCH] =?UTF-8?q?company-service=20RelationService=20=D0=BE?= =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=BF=D1=80=D0=BE=D0=B2?= =?UTF-8?q?=D0=B5=D1=80=D0=BA=D1=83=20=D1=81=D1=82=D0=B0=D1=82=D1=83=D1=81?= =?UTF-8?q?=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru/spcex/clearing/company/service/RelationService.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/RelationService.java b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/RelationService.java index 6ec94ef56..9f355922c 100644 --- a/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/RelationService.java +++ b/clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/service/RelationService.java @@ -31,6 +31,7 @@ import ru.spcex.platform.imdg.api.Imdg; import ru.spcex.platform.imdg.api.ImdgId; import ru.spcex.platform.imdg.api.ImdgProvider; import ru.spcex.platform.imdg.api.ImdgTransaction; +import ru.spcex.platform.utils.enumeration.IEnumKey; import ru.spcex.platform.utils.error.ValidationException; import ru.spcex.platform.utils.validation.IValidator; @@ -135,7 +136,9 @@ public class RelationService extends QueueConsumer implements InitializingBean { Company company = companyMap.getSingleObjectByID(req.getCompanyId()); Relation existRelation = searchRelation(req.getClearingMemberCategory(), req.getCompanyId()); - if (existRelation != null && !WorkflowStatus.Blocked.equalsByKey(existRelation.getServiceStatus())) { + boolean isClosedRelation = existRelation != null && IEnumKey.contains + (existRelation.getServiceStatus(), Closed, ServiceStatus.Blocked, ServiceStatus.Suspended); + if (existRelation != null && !isClosedRelation) { CompanyErrors errorType; if (MKR.equalsByKey(existRelation.getService())) { errorType = CompanyErrors.ClearingMemberCategoryOnMKRAlreadyExist;