|
|
|
@@ -161,6 +161,10 @@ public class HomeController extends BaseController { |
|
|
|
Map map = new HashMap(); |
|
|
|
if (mall.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode()) && |
|
|
|
StringUtils.isBlank(info.getParentTenantId())) { |
|
|
|
|
|
|
|
Session session = SecurityUtils.getSubject().getSession(); |
|
|
|
session.setAttribute(UserSession.isParent, EnumGroupSupport.SUPPORT.getCode()); |
|
|
|
|
|
|
|
// 集团用户获取子商场 |
|
|
|
List<WxMall> mallList = mallService.getSubByParentTenantId(info.getTenantId()); |
|
|
|
map.put("subMalls", JSON.toJSONString(mallList)); |
|
|
|
@@ -198,6 +202,7 @@ public class HomeController extends BaseController { |
|
|
|
logger.debug(map.toString()); |
|
|
|
|
|
|
|
String tenantId = map.get("tenantId"); |
|
|
|
String subTenantId = map.get("subTenantId"); |
|
|
|
String parentTenantId = map.get("parentTenantId"); |
|
|
|
|
|
|
|
if (StringUtils.isBlank(tenantId)) { |
|
|
|
@@ -207,10 +212,11 @@ public class HomeController extends BaseController { |
|
|
|
MallUserInfo userInfo = getUser(); |
|
|
|
if (userInfo.getTenantId().equalsIgnoreCase(tenantId)) { |
|
|
|
Session session = SecurityUtils.getSubject().getSession(); |
|
|
|
session.setAttribute(UserSession.tenantId, tenantId); |
|
|
|
if (StringUtils.isNotBlank(parentTenantId)) { |
|
|
|
session.setAttribute(UserSession.parentTenantId, parentTenantId); |
|
|
|
if (StringUtils.isNotBlank(subTenantId)) { |
|
|
|
session.setAttribute(UserSession.tenantId, subTenantId); |
|
|
|
session.setAttribute(UserSession.parentTenantId, tenantId); |
|
|
|
} else { |
|
|
|
session.setAttribute(UserSession.tenantId, tenantId); |
|
|
|
session.setAttribute(UserSession.parentTenantId, null); |
|
|
|
} |
|
|
|
} |
|
|
|
|