From eedb15dba77818903cd926aca140813dd829fe8d Mon Sep 17 00:00:00 2001 From: aalehin Date: Mon, 12 Dec 2022 13:31:53 +0300 Subject: [PATCH] =?UTF-8?q?http://jira.mfd.msk:8088/browse/CLS-63=20---=20?= =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=BD=D0=BB?= =?UTF-8?q?=D0=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../spcex/clearing/imdg/object/UserRoleSessionMapStore.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/UserRoleSessionMapStore.java b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/UserRoleSessionMapStore.java index f1f9cd4cf..fdc8edf8b 100644 --- a/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/UserRoleSessionMapStore.java +++ b/clearing-parent/imdg/src/main/java/ru/spcex/clearing/imdg/object/UserRoleSessionMapStore.java @@ -29,7 +29,7 @@ public class UserRoleSessionMapStore extends TemplateMapStore { @Override public String[] getFields() { return new String[]{ - "ID", "USER_ID", "USER_ROLE", "COMPANY_ID", "STATUS" + "ID", "USER_ID", "USER_ROLE", "COMPANY_ID", "STATUS" }; } @@ -40,7 +40,7 @@ public class UserRoleSessionMapStore extends TemplateMapStore { object.setId(resultSet.getObject("ID", Long.class)); object.setUserId(resultSet.getObject("USER_ID", Long.class)); object.setUserRole(resultSet.getObject("USER_ROLE", String.class)); - object.setCompanyId(companyId.equals(0L) ? 1 : companyId); + object.setCompanyId(companyId == null || companyId.equals(0L) ? 1 : companyId); object.setStatus(resultSet.getObject("STATUS", String.class)); return object; }