init

ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java

@@ -5,6 +5,7 @@ import cn.dev33.satoken.secure.BCrypt;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.ttl.TransmittableThreadLocal;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.component.core.constant.CacheConstants;
 import com.ruoyi.component.core.constant.Constants;
@@ -79,12 +80,12 @@ public class SysLoginService {
         }
         // 框架登录不限制从什么表查询 只要最终构建出 LoginUser 即可
         SysUser user = TenantHelper.ignore(() -> loadUserByUsername(username));
+        TenantHelper.setTenantId(user.getTenantId());
         checkLogin(LoginType.PASSWORD, username, () -> !BCrypt.checkpw(password, user.getPassword()));
         // 此处可根据登录用户的数据不同 自行创建 loginUser 属性不够用继承扩展就行了
         LoginUser loginUser = buildLoginUser(user);
         // 生成token
         LoginHelper.loginByDevice(loginUser, DeviceType.PC);
-        TenantHelper.setTenantId(loginUser.getTenantId());
         recordLogininfor(username,loginUser.getUserType(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"));
         recordLoginInfo(user.getUserId(), username);
         return StpUtil.getTokenValue();