Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

liyong

昨天 88ae1e650fc2fc30928edfe8f3cc39108d8d1ccd

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

@@ -15,6 +15,7 @@
import com.ruoyi.project.system.mapper.SysDeptMapper;

import com.ruoyi.project.system.service.ISysMenuService;

import com.ruoyi.project.system.service.ISysUserDeptService;

import com.ruoyi.project.system.service.ISysUserService;
import lombok.AllArgsConstructor;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.util.ObjectUtils;

@@ -43,6 +44,7 @@
    private SysPermissionService permissionService;

    private TokenService tokenService;

    private ISysUserDeptService userDeptService;

    private ISysUserService userService;
    private SysDeptMapper sysDeptMapper;



    /**

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

    {

        LoginUser loginUser = SecurityUtils.getLoginUser();

        SysUser user = loginUser.getUser();

        SysUser user = userService.selectUserById(loginUser.getUserId());
        if (user == null)
        {
            user = loginUser.getUser();
        }
        else
        {
            loginUser.setUser(user);
            loginUser.setAiEnabled(user.getAiEnabled());
            tokenService.setLoginUser(loginUser);
        }
        // 获取当前登录公司

        Long tenantId = loginUser.getTenantId();

        if(null != tenantId){

@@ -92,6 +104,7 @@
        }

        AjaxResult ajax = AjaxResult.success();

        ajax.put("user", user);

        ajax.put("aiEnabled", loginUser.getAiEnabled());
        ajax.put("roles", roles);

        ajax.put("permissions", permissions);

        return ajax;