From aa70998cee74cb6f31c3925b4e05368da8a5233a Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Mon, 22 Oct 2018 22:05:39 +0800 Subject: [PATCH] =?UTF-8?q?[C=E7=AB=AF=E8=8E=B7=E5=8F=96tenantId=E4=BC=98?= =?UTF-8?q?=E5=8C=96][=E4=BF=AE=E6=94=B9]:=E4=BC=98=E5=8C=96tenantId?= =?UTF-8?q?=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/BaseController.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java index 22d9365a9..c6b42b00f 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java @@ -59,26 +59,24 @@ public class BaseController { }); } - public WxCUser getUser() { - Long cUserId = getUserId(); - WxCUser user = wxCUserService.getById(cUserId); - if (user == null) - throw new MallinkException(ErrorCode.USER_IS_EMPTY); - return user; - } - public Long getUserId() { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); Long cUserId = (Long) request.getAttribute(AuthorizationInterceptor.LOGIN_USER_KEY); return cUserId; } - public String getTenantId() { + public WxCUser getUser() { Long cUserId = getUserId(); WxCUser user = wxCUserService.getById(cUserId); if (user == null) throw new MallinkException(ErrorCode.USER_IS_EMPTY); - return user.getTenantId(); + return user; + } + + public String getTenantId() { + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String tenantId = (String) request.getAttribute(AuthorizationInterceptor.TENANT_ID); + return tenantId; } public WxAppinfo getAppInfo(String appId) {