From fb2370bcdc743eebbb6d4c58e41cadd5b311bd82 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 21 Jul 2020 17:53:21 +0800 Subject: [PATCH] login -- PARENT_TENANT_ID --- .../controller/WxUserGrantController.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index ea02dbcc4..6610b4304 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -168,6 +168,8 @@ public class WxUserGrantController extends BaseController { if (!wxAuthorizerInfo.getEnable().equals(EnumEnableType.Enable.getCode())) { return new ResultData(ErrorCode.APP_ID_NOT_ENABLE); } + + WxMall wxMall = mallService.getById(Long.valueOf(wxAuthorizerInfo.getTenantId())); // 集团版,获取子集团list List mallList = null; if (wxAuthorizerInfo.getGroupSupport().equals(EnumGroupSupport.SUPPORT.getCode())) { @@ -265,11 +267,16 @@ public class WxUserGrantController extends BaseController { request.setAttribute(Constant.LOGIN_USER_KEY, oldUser.getId()); request.setAttribute(Constant.TENANT_ID, wxAuthorizerInfo.getTenantId()); + if(StringUtils.isBlank(oldUser.getParentTenantId()) && StringUtils.isNotBlank(wxMall.getParentTenantId())){ + oldUser.setParentTenantId(wxMall.getParentTenantId()); + request.setAttribute(Constant.PARENT_TENANT_ID, wxMall.getParentTenantId()); + } + // 老用户,给出来已选中的mall if (mallList != null) { WxMall selectedMall = null; if (StringUtils.isNotBlank(oldUser.getParentTenantId())) { - final String lastSubTenant = oldUser.getParentTenantId(); + final String lastSubTenant = oldUser.getTenantId(); List selMallList = mallList.stream().filter(ml -> ml.getTenantId().equalsIgnoreCase(lastSubTenant)).collect(Collectors.toList()); if (selMallList.size() > 0) { selectedMall = selMallList.get(0); @@ -282,9 +289,9 @@ public class WxUserGrantController extends BaseController { } } if (selectedMall != null) { - request.setAttribute(Constant.PARENT_TENANT_ID, selectedMall.getTenantId()); + request.setAttribute(Constant.PARENT_TENANT_ID, selectedMall.getParentTenantId()); resultMap.put("selectedMall", selectedMall.getTenantId()); - oldUser.setParentTenantId(selectedMall.getTenantId()); + oldUser.setParentTenantId(selectedMall.getParentTenantId()); } } @@ -328,6 +335,9 @@ public class WxUserGrantController extends BaseController { } else { // 新用户 newUser.updateTenantInfo(wxAuthorizerInfo); + if(StringUtils.isNotBlank(wxMall.getParentTenantId())){ + newUser.setParentTenantId(wxMall.getParentTenantId()); + } token = newUser.createToken(new Date()); newUser.setRegisterIp(ipaddress);