From fe241653b5210597dafdcdb4572a04fdddf950d1 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Mon, 29 May 2023 14:36:41 +0300 Subject: [PATCH] =?UTF-8?q?company-service=20=D1=83=D0=BB=D1=83=D1=87?= =?UTF-8?q?=D1=88=D0=B8=D0=BB=20=D0=B2=D0=B0=D0=BB=D0=B8=D0=B4=D0=B0=D1=86?= =?UTF-8?q?=D0=B8=D1=8E=20=D0=B4=D0=BB=D1=8F=20Relation=20companyId?= 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 7632612c6..6341e2e88 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 @@ -118,7 +118,9 @@ public class RelationService extends QueueConsumer implements InitializingBean { String serviceStatus = req.getServiceStatus(); if (serviceStatus == null || serviceStatus.isEmpty()) { Company company = companyMap.getSingleObjectByID(req.getCompanyId()); - req.setServiceStatus(company.getWorkflowStatus()); + if (company != null) { + req.setServiceStatus(company.getWorkflowStatus()); + } } } { // Валидация @@ -281,6 +283,7 @@ public class RelationService extends QueueConsumer implements InitializingBean { // --- internal API --- protected void createNewRelation(ImdgTransaction transaction, Long companyId, ClearingMemberCategory clearingMemberCategory) { + Objects.requireNonNull(companyId, "companyId"); Imdg relationMap = transaction.getImdg(IMDGDistributedNames.Map_Relation, Relation.class); Relation relation = new Relation(); Company company = transaction.getImdg(IMDGDistributedNames.Map_Company, Company.class).getSingleObjectByFieldValues(Map.of("id", companyId));