diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java index 63363c223..b8a9a9e29 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java @@ -68,10 +68,9 @@ public class BaseController { Session session = SecurityUtils.getSubject().getSession(); String tenantId = (String)session.getAttribute(UserSession.tenantId); String parentTenantId = (String)session.getAttribute(UserSession.parentTenantId); - TenantEntity tenantEntity = new TenantEntity(){{ - setTenantId(tenantId); - setParentTenantId(parentTenantId); - }}; + TenantEntity tenantEntity = new TenantEntity(); + tenantEntity.setTenantId(tenantId); + tenantEntity.setParentTenantId(parentTenantId); return tenantEntity; } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java index 6a4184022..0d1e26abf 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java @@ -105,10 +105,9 @@ public class BaseController { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String tenantId = (String) request.getAttribute(Constant.TENANT_ID); String parentTenantId = (String) request.getAttribute(Constant.PARENT_TENANT_ID); - TenantEntity tenantEntity = new TenantEntity() {{ - setTenantId(tenantId); - setParentTenantId(parentTenantId); - }}; + TenantEntity tenantEntity = new TenantEntity(); + tenantEntity.setTenantId(tenantId); + tenantEntity.setParentTenantId(parentTenantId); return tenantEntity; } diff --git a/mallinkSysAdmin/src/main/java/com/iformall/controller/base/BaseController.java b/mallinkSysAdmin/src/main/java/com/iformall/controller/base/BaseController.java index 724035dbf..57b87164b 100644 --- a/mallinkSysAdmin/src/main/java/com/iformall/controller/base/BaseController.java +++ b/mallinkSysAdmin/src/main/java/com/iformall/controller/base/BaseController.java @@ -67,11 +67,9 @@ public class BaseController { Session session = SecurityUtils.getSubject().getSession(); String tenantId = (String)session.getAttribute(UserSession.tenantId); String parentTenantId = (String)session.getAttribute(UserSession.parentTenantId); - - TenantEntity tenantEntity = new TenantEntity(){{ - setTenantId(tenantId); - setParentTenantId(parentTenantId); - }}; + TenantEntity tenantEntity = new TenantEntity() ; + tenantEntity.setTenantId(tenantId); + tenantEntity.setParentTenantId(parentTenantId); return tenantEntity; } diff --git a/mallinkWebSocketServer/src/main/java/com/iformall/controller/BaseController.java b/mallinkWebSocketServer/src/main/java/com/iformall/controller/BaseController.java index be3b0609c..1096fa9e9 100644 --- a/mallinkWebSocketServer/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkWebSocketServer/src/main/java/com/iformall/controller/BaseController.java @@ -61,11 +61,9 @@ public class BaseController { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); String tenantId = (String)request.getAttribute(AuthHandshakeInterceptor.TENANT_ID); String parentTenantId = (String)request.getAttribute(AuthHandshakeInterceptor.PARENT_TENANT_ID); - - TenantEntity tenantEntity = new TenantEntity(){{ - setTenantId(tenantId); - setParentTenantId(parentTenantId); - }}; + TenantEntity tenantEntity = new TenantEntity() ; + tenantEntity.setTenantId(tenantId); + tenantEntity.setParentTenantId(parentTenantId); return tenantEntity; }