From 5c9dd1ccb1e9c1fba4f51f6d9c0de4e76937c2e4 Mon Sep 17 00:00:00 2001 From: Eduard Tihomirov Date: Wed, 7 Aug 2024 15:21:30 +0300 Subject: [PATCH] SUPPORT-8407: Fix --- .../java/esia/model/OrganizationModel.java | 20 +++++-------------- .../java/esia/service/UlDataServiceImpl.java | 2 +- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/backend/src/main/java/esia/model/OrganizationModel.java b/backend/src/main/java/esia/model/OrganizationModel.java index 3e4f6880..471e7dfb 100644 --- a/backend/src/main/java/esia/model/OrganizationModel.java +++ b/backend/src/main/java/esia/model/OrganizationModel.java @@ -22,13 +22,11 @@ public class OrganizationModel implements Serializable { private String type; - private String typeName; - private String inn; private String ogrn; - private String orgTypeLeg; + private String leg; private String kpp; @@ -88,12 +86,12 @@ public class OrganizationModel implements Serializable { this.ogrn = ogrn; } - public String getOrgTypeLeg() { - return orgTypeLeg; + public String getLeg() { + return leg; } - public void setOrgTypeLeg(String orgTypeLeg) { - this.orgTypeLeg = orgTypeLeg; + public void setLeg(String leg) { + this.leg = leg; } public String getKpp() { @@ -152,14 +150,6 @@ public class OrganizationModel implements Serializable { this.type = type; } - public String getTypeName() { - return typeName; - } - - public void setTypeName(String typeName) { - this.typeName = typeName; - } - public Long getStaffCount() { return staffCount; } diff --git a/backend/src/main/java/esia/service/UlDataServiceImpl.java b/backend/src/main/java/esia/service/UlDataServiceImpl.java index b271bd54..3341867c 100644 --- a/backend/src/main/java/esia/service/UlDataServiceImpl.java +++ b/backend/src/main/java/esia/service/UlDataServiceImpl.java @@ -58,7 +58,7 @@ public class UlDataServiceImpl implements UlDataService { private EmployeeModel getEmplData(String prsnId, String orgOid, String accessToken) { try { String url = esiaConfig.getEsiaBaseUri() + "rs/orgs/" + orgOid + "/emps/" + prsnId; - HttpRequest getReq = HttpRequest.newBuilder(URI.create(url + prsnId)) + HttpRequest getReq = HttpRequest.newBuilder(URI.create(url)) .header(HttpHeaders.CONTENT_TYPE, "application/x-www-form-urlencoded") .header("Authorization", "Bearer ".concat(accessToken)) .GET()