Przeglądaj źródła

fix bug

release_toaliyun_real
xiaohanzi 5 lat temu
rodzic
commit
ce8f35306e
4 zmienionych plików z 12 dodań i 18 usunięć
  1. +3
    -4
      mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java
  2. +3
    -4
      mallinkBApi/src/main/java/com/iformall/controller/BaseController.java
  3. +3
    -5
      mallinkSysAdmin/src/main/java/com/iformall/controller/base/BaseController.java
  4. +3
    -5
      mallinkWebSocketServer/src/main/java/com/iformall/controller/BaseController.java

+ 3
- 4
mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java Wyświetl plik

@@ -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;
}



+ 3
- 4
mallinkBApi/src/main/java/com/iformall/controller/BaseController.java Wyświetl plik

@@ -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;
}



+ 3
- 5
mallinkSysAdmin/src/main/java/com/iformall/controller/base/BaseController.java Wyświetl plik

@@ -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;
}



+ 3
- 5
mallinkWebSocketServer/src/main/java/com/iformall/controller/BaseController.java Wyświetl plik

@@ -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;
}



Ładowanie…
Anuluj
Zapisz