yuan
6 天以前 20ad0e6c5ae8553c3a1af2b9ba92f6358f1e408b
src/main/java/com/ruoyi/framework/security/service/SysLoginService.java
@@ -121,7 +121,7 @@
        boolean captchaEnabled = configService.selectCaptchaEnabled();
        if (captchaEnabled)
        {
            String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + StringUtils.nvl(uuid, "");
            String verifyKey = CacheConstants.PREFIX + CacheConstants.CAPTCHA_CODE_KEY + StringUtils.nvl(uuid, "");
            String captcha = redisCache.getCacheObject(verifyKey);
            if (captcha == null)
            {
@@ -270,13 +270,13 @@
        LoginUser loginUser = (LoginUser) authentication.getPrincipal();
        recordLoginInfo(loginUser.getUserId());
        // 更新用户信息,修改当前选中公司
        SysUser user = loginUser.getUser();
        if(factoryId != null){
            user.setTenantId(factoryId);
        }else{
            user.setTenantId(tokenService.getDeptIdsByUserId(user.getUserId())[0]);
        }
        sysUserMapper.updateUser(user);
//        SysUser user = loginUser.getUser();
//        if(factoryId != null){
//            user.setTenantId(factoryId);
//        }else{
//            user.setTenantId(tokenService.getDeptIdsByUserId(user.getUserId())[0]);
//        }
//        sysUserMapper.updateUser(user);
        // 生成token
        return tokenService.createToken(loginUser);
    }