From 5beea2d551d2695a443ca968389c5a9dd4609acf Mon Sep 17 00:00:00 2001 From: ialbert Date: Mon, 10 Oct 2022 14:48:30 +0300 Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-75 company controller nlp fix --- .../entity/company/CompanyBackendGetAll.java | 36 ++++++++++--------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyBackendGetAll.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyBackendGetAll.java index d7f4fab4f..59ee43b96 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyBackendGetAll.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/response/entity/company/CompanyBackendGetAll.java @@ -53,23 +53,25 @@ public class CompanyBackendGetAll extends BasicSpcexResponse { singleItem.setUpdated(company.getUpdated()); CompanyBackendGetFields.CompanyInfoFields companyInfoFields = new CompanyBackendGetFields.CompanyInfoFields(); CompanyInfo profile = company.getProfile(); - companyInfoFields.setId(profile.getId()); - companyInfoFields.setCompanyId(profile.getCompanyId()); - companyInfoFields.setCorporationSoleType(profile.getCorporationSoleType()); - companyInfoFields.setCountryCode(profile.getCountryCode()); - companyInfoFields.setDescription(profile.getDescription()); - companyInfoFields.setProfessionalSign(profile.getProfessionalSign()); - companyInfoFields.setLegalKind(profile.getLegalKind()); - companyInfoFields.setOrganizationType(profile.getOrganizationType()); - companyInfoFields.setResidence(profile.getResidence()); - companyInfoFields.setShortName(profile.getShortName()); - companyInfoFields.setFullName(profile.getFullName()); - companyInfoFields.setShortNameEng(profile.getShortNameEng()); - companyInfoFields.setFullNameEng(profile.getFullNameEng()); - companyInfoFields.setTradingCode(profile.getTradingCode()); - companyInfoFields.setClearingCode(profile.getClearingCode()); - companyInfoFields.setRegistrationCode(profile.getRegistrationCode()); - singleItem.setProfile(companyInfoFields); + if (profile != null) { + companyInfoFields.setId(profile.getId()); + companyInfoFields.setCompanyId(profile.getCompanyId()); + companyInfoFields.setCorporationSoleType(profile.getCorporationSoleType()); + companyInfoFields.setCountryCode(profile.getCountryCode()); + companyInfoFields.setDescription(profile.getDescription()); + companyInfoFields.setProfessionalSign(profile.getProfessionalSign()); + companyInfoFields.setLegalKind(profile.getLegalKind()); + companyInfoFields.setOrganizationType(profile.getOrganizationType()); + companyInfoFields.setResidence(profile.getResidence()); + companyInfoFields.setShortName(profile.getShortName()); + companyInfoFields.setFullName(profile.getFullName()); + companyInfoFields.setShortNameEng(profile.getShortNameEng()); + companyInfoFields.setFullNameEng(profile.getFullNameEng()); + companyInfoFields.setTradingCode(profile.getTradingCode()); + companyInfoFields.setClearingCode(profile.getClearingCode()); + companyInfoFields.setRegistrationCode(profile.getRegistrationCode()); + singleItem.setProfile(companyInfoFields); + } payload.getItems().add(singleItem); } }