登录修改

chenrui

4 天以前 6e7c712456a8cf5693321edd2f3482aaf61d08b0

 src/main/java/com/ruoyi/framework/security/service/UserDetailsServiceImpl.java

@@ -1,17 +1,23 @@
package com.ruoyi.framework.security.service;



import com.ruoyi.project.system.mapper.SysDeptMapper;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

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

import org.springframework.security.core.Authentication;

import org.springframework.security.core.context.SecurityContextHolder;

import org.springframework.security.core.userdetails.UserDetails;

import org.springframework.security.core.userdetails.UserDetailsService;

import org.springframework.stereotype.Service;

import com.ruoyi.common.enums.UserStatus;

import com.ruoyi.common.exception.ServiceException;

import com.ruoyi.common.utils.MessageUtils;

import com.ruoyi.common.utils.StringUtils;

import com.ruoyi.framework.security.LoginUser;

import com.ruoyi.project.system.domain.SysUser;

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



import java.util.Map;



/**

 * 用户验证处理

@@ -32,6 +38,9 @@
    @Autowired

    private SysPermissionService permissionService;



    @Autowired

    private SysDeptMapper deptMapper;



    @Override

    public UserDetails loadUserByUsername(String username)

    {

@@ -39,19 +48,33 @@
        if (StringUtils.isNull(user))

        {

            log.info("登录用户：{} 不存在.", username);

            throw new ServiceException("登录用户：" + username + " 不存在");

            throw new ServiceException(MessageUtils.message("user.not.exists"));

        }

        else if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))

        {

            log.info("登录用户：{} 已被删除.", username);

            throw new ServiceException("对不起，您的账号：" + username + " 已被删除");

            throw new ServiceException(MessageUtils.message("user.password.delete"));

        }

        else if (UserStatus.DISABLE.getCode().equals(user.getStatus()))

        {

            log.info("登录用户：{} 已被停用.", username);

            throw new ServiceException("对不起，您的账号：" + username + " 已停用");

            throw new ServiceException(MessageUtils.message("user.blocked"));

        }

        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();



        // 获取 details

        Object details = authentication.getDetails();

        Long factoryId = null;

        if (details instanceof Map) {

            factoryId = (Long) ((Map<?, ?>) details).get("factoryId");

            if(null != factoryId){

                // 查询租户

                Long teantId = deptMapper.maxLevelDeptId(factoryId);

                user.setCurrentDeptId(factoryId);

                user.setTenantId(teantId.intValue());

            }

        }

        // 获取用户当前登录部门，并查询租户id

        passwordService.validate(user);



        return createLoginUser(user);

@@ -59,6 +82,6 @@


    public UserDetails createLoginUser(SysUser user)

    {

        return new LoginUser(user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user));

        return new LoginUser(user.getUserId(), user.getDeptIds(), user, user.getTenantId(),user.getCurrentDeptId(), permissionService.getMenuPermission(user));

    }

}