From c1de35e101d496db0eccd602619e49d022a5e283 Mon Sep 17 00:00:00 2001
From: etreschenkov <etreschenkov@mfd.ru>
Date: Wed, 18 Jan 2023 11:25:48 +0300
Subject: [PATCH] fix bugs

---
 .../controller/queue/company/EditCompanyInfoController.java   | 2 +-
 .../spcex/clearing/imdg/businessobject/CompanyMapStore.java   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/EditCompanyInfoController.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/EditCompanyInfoController.java
index e2fce230c..65b9e227f 100644
--- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/EditCompanyInfoController.java
+++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/controller/queue/company/EditCompanyInfoController.java
@@ -63,7 +63,7 @@ public class EditCompanyInfoController extends AbstractQueueController {
         Collection<Map<String, Object>> all = new ArrayList<>();
         Collection<Company> companies = companyImdg.getAllValues();
         for (Company company : companies) {
-            if (company.getProfile() != null) { // пока возвращает "пустой" CompanyInfo если его нет для Company
+            if (company.getProfile() != null && company.getProfile().getId() != null) { // пока возвращает "пустой" CompanyInfo если его нет для Company
                 all.add(responseFactory.responseFromObject(company.getProfile()));
             }
         }
diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/CompanyMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/CompanyMapStore.java
index 31e9dc4cb..20635d976 100644
--- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/CompanyMapStore.java
+++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/businessobject/CompanyMapStore.java
@@ -100,7 +100,7 @@ public class CompanyMapStore extends BusinessObjectMapStore<Company> {
         if (id == null)
             return null;
         List<CompanyInfo> results = jdbcTemplate.query(
-                "SELECT * FROM COMPANY_INFO WHERE id = ?", new Object[]{id}, // todo id=comapny.id? Или сделать отдельный ID?
+                "SELECT * FROM COMPANY_INFO WHERE company_id = ?", new Object[]{id}, // todo id=comapny.id? Или сделать отдельный ID?
                 (rs, rowNum) -> {
                     CompanyInfo companyInfo = new CompanyInfo();
                     companyInfo.setId(rs.getObject("Id", Long.class));
@@ -126,7 +126,7 @@ public class CompanyMapStore extends BusinessObjectMapStore<Company> {
         if (onceObject == null) {
             log.warn("No row in table COMPANY_INFO where id={}. Create empty ", id);
             onceObject = new CompanyInfo();
-            onceObject.setId(id); // чтобы не потерять id
+            onceObject.setCompanyId(id); // чтобы не потерять id
         }
         return onceObject;
     }