From 67a2f6dd7611b9432c254ec47896a595cf106b87 Mon Sep 17 00:00:00 2001 From: xhxu Date: Sat, 25 Jul 2020 13:15:51 +0800 Subject: [PATCH] denglu --- .../controller/WxUserGrantController.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index 0353fa413..bc6557de3 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -267,11 +267,13 @@ public class WxUserGrantController extends BaseController { resultMap.put("token", token); request.setAttribute(Constant.LOGIN_USER_KEY, oldUser.getId()); - request.setAttribute(Constant.TENANT_ID, wxAuthorizerInfo.getTenantId()); + request.setAttribute(Constant.TENANT_ID, oldUser.getTenantId()); if(StringUtils.isBlank(oldUser.getParentTenantId()) && StringUtils.isNotBlank(wxMall.getParentTenantId())){ oldUser.setParentTenantId(wxMall.getParentTenantId()); - request.setAttribute(Constant.PARENT_TENANT_ID, wxMall.getParentTenantId()); + } + if(StringUtils.isNotBlank(oldUser.getParentTenantId())){ + request.setAttribute(Constant.PARENT_TENANT_ID, oldUser.getParentTenantId()); } // 老用户,给出来已选中的mall @@ -291,9 +293,9 @@ public class WxUserGrantController extends BaseController { } } if (selectedMall != null) { - request.setAttribute(Constant.PARENT_TENANT_ID, selectedMall.getParentTenantId()); + request.setAttribute(Constant.TENANT_ID, selectedMall.getTenantId()); resultMap.put("selectedMall", selectedMall.getTenantId()); - oldUser.setParentTenantId(selectedMall.getParentTenantId()); +// oldUser.setParentTenantId(selectedMall.getParentTenantId()); } } @@ -371,11 +373,14 @@ public class WxUserGrantController extends BaseController { resultMap.put("token", token); request.setAttribute(Constant.LOGIN_USER_KEY, newUser.getId()); request.setAttribute(Constant.TENANT_ID, newUser.getTenantId()); + if(StringUtils.isNotBlank(newUser.getParentTenantId())){ + request.setAttribute(Constant.PARENT_TENANT_ID, newUser.getParentTenantId()); + } if (mallList != null) { WxMall firstMall = mallList.get(0); if (firstMall != null) { // 默认选中第一个mall, 或者经纬度最近的那个 - request.setAttribute(Constant.PARENT_TENANT_ID, firstMall.getTenantId()); + request.setAttribute(Constant.TENANT_ID, firstMall.getTenantId()); resultMap.put("selectedMall", firstMall.getTenantId()); newUser.setParentTenantId(firstMall.getTenantId()); }