|
|
|
@@ -52,13 +52,13 @@ public class BaseController { |
|
|
|
}); |
|
|
|
} |
|
|
|
public MallUserInfo getUser(){ |
|
|
|
MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); |
|
|
|
// MallUserInfo user = new MallUserInfo(); |
|
|
|
// user.setId(321127266275430400L); |
|
|
|
// user.setName("alitest"); |
|
|
|
// user.setTenantId("789"); |
|
|
|
// user.setParentTenantId(null); |
|
|
|
// user.setIsAdmin(1); |
|
|
|
// MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); |
|
|
|
MallUserInfo user = new MallUserInfo(); |
|
|
|
user.setId(321127266275430400L); |
|
|
|
user.setName("alitest"); |
|
|
|
user.setTenantId("789"); |
|
|
|
user.setParentTenantId(null); |
|
|
|
user.setIsAdmin(1); |
|
|
|
return user; |
|
|
|
} |
|
|
|
|
|
|
|
@@ -80,10 +80,10 @@ public class BaseController { |
|
|
|
*/ |
|
|
|
public TenantEntity getTenantInfo(){ |
|
|
|
Session session = SecurityUtils.getSubject().getSession(); |
|
|
|
String tenantId = (String)session.getAttribute(UserSession.tenantId); |
|
|
|
String parentTenantId = (String)session.getAttribute(UserSession.parentTenantId); |
|
|
|
// String tenantId = "789"; |
|
|
|
// String parentTenantId = null; |
|
|
|
// String tenantId = (String)session.getAttribute(UserSession.tenantId); |
|
|
|
// String parentTenantId = (String)session.getAttribute(UserSession.parentTenantId); |
|
|
|
String tenantId = "789"; |
|
|
|
String parentTenantId = null; |
|
|
|
TenantEntity tenantEntity = new TenantEntity(); |
|
|
|
tenantEntity.setTenantId(tenantId); |
|
|
|
tenantEntity.setParentTenantId(parentTenantId); |
|
|
|
|