校验租户ID

src/main/java/cn/quantgroup/xyqb/controller/internal/user/AppController.java

@@ -15,7 +15,6 @@ import cn.quantgroup.xyqb.security.AuthorizationPoint;
 import cn.quantgroup.xyqb.service.merchant.IMerchantService;
 import cn.quantgroup.xyqb.service.register.IUserRegisterService;
 import cn.quantgroup.xyqb.service.session.ISessionService;
-import cn.quantgroup.xyqb.service.user.IOauthClientDetailsService;
 import cn.quantgroup.xyqb.service.user.IOauthLoginInfoService;
 import cn.quantgroup.xyqb.service.user.IUserService;
 import cn.quantgroup.xyqb.util.IpUtil;
@@ -317,7 +316,7 @@ public class AppController implements IBaseController {
             return JsonResult.buildErrorStateResult("登录失败", null);
         }
         //校验租户ID tenantId
-        if (TenantUtil.TENANT_DEFAULT != null && !TenantUtil.TENANT_DEFAULT.equals(0)) {
+        if (tenantId != null && !TenantUtil.TENANT_DEFAULT.equals(0)) {
             oauthLoginInfoService.addLoginInfo(user, tenantId);
         }
         LoginProperties loginProperties = new LoginProperties("", 4, channelId, registerFrom, appChannel, null, "", tenantId);

src/main/java/cn/quantgroup/xyqb/service/middleoffice/applet/impl/AppletServiceImpl.java

@@ -2,21 +2,19 @@ package cn.quantgroup.xyqb.service.middleoffice.applet.impl;
 
 import cn.quantgroup.xyqb.controller.middleoffice.login.ILoginModule;
 import cn.quantgroup.xyqb.controller.middleoffice.login.LoginVo;
-import cn.quantgroup.xyqb.entity.middleoffice.AppletParamEntry;
 import cn.quantgroup.xyqb.entity.User;
 import cn.quantgroup.xyqb.entity.WechatUserInfo;
+import cn.quantgroup.xyqb.entity.middleoffice.AppletParamEntry;
 import cn.quantgroup.xyqb.exception.AppletException;
 import cn.quantgroup.xyqb.repository.IWeChatUserRepository;
 import cn.quantgroup.xyqb.service.middleoffice.applet.IAppletService;
 import cn.quantgroup.xyqb.service.register.IUserRegisterService;
 import cn.quantgroup.xyqb.service.user.IOauthLoginInfoService;
 import cn.quantgroup.xyqb.service.user.IUserService;
-import cn.quantgroup.xyqb.util.TenantUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ObjectUtils;
 
 /**
  * @author ：dongjianhua
@@ -103,7 +101,7 @@ public class AppletServiceImpl implements IAppletService {
             throw new AppletException("未找到此用户","0401");
         }
         //校验租户ID tenantId
-        if (TenantUtil.TENANT_DEFAULT != null && !TenantUtil.TENANT_DEFAULT.equals(0)) {
+        if (tenantId != null && !tenantId.equals(0)) {
             iOauthLoginInfoService.addLoginInfo(user, tenantId);
         }
         LoginVo loginVo = loginModule.loginByUserId(user.getRegisteredFrom(),

src/main/java/cn/quantgroup/xyqb/service/user/impl/UserServiceImpl.java

@@ -385,7 +385,7 @@ public class UserServiceImpl implements IUserService, IBaseController {
             log.info("神策埋点出现问题", e);
         }
         //校验租户ID tenantId
-        if (TenantUtil.TENANT_DEFAULT != null && !TenantUtil.TENANT_DEFAULT.equals(0)) {
+        if (tenantId != null && !tenantId.equals(0)) {
             oauthLoginInfoService.addLoginInfo(user, tenantId);
         }
         LoginProperties loginProperties = new LoginProperties("", 3, channelId, createdFrom, appChannel, merchant.getId(), merchant.getName(), tenantId);