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) {