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));