Merge remote-tracking branch 'origin/dev_New_pro' into dev_宁夏_英泽防锈

liyong

3 天以前 f57064d2fa563ee4cfeeccd715850ba8b8aa4f60

 src/main/java/com/ruoyi/project/system/controller/SysLoginController.java

@@ -73,17 +73,7 @@
    public AjaxResult getInfo()

    {

        LoginUser loginUser = SecurityUtils.getLoginUser();

        SysUser user = userService.selectUserById(loginUser.getUserId());
        if (user == null)
        {
            user = loginUser.getUser();
        }
        else
        {
            loginUser.setUser(user);
            loginUser.setAiEnabled(user.getAiEnabled());
            tokenService.setLoginUser(loginUser);
        }
        SysUser user = loginUser.getUser();

        // 获取当前登录公司

        Long tenantId = loginUser.getTenantId();

        if(null != tenantId){