lbqms.git - Gitblit

			@@ -1,11 +1,5 @@
			package com.ruoyi.framework.web.service;

			import com.ruoyi.common.core.domain.entity.SysUser;
			import com.ruoyi.common.core.domain.model.LoginUser;
			import com.ruoyi.common.enums.UserStatus;
			import com.ruoyi.common.exception.BaseException;
			import com.ruoyi.common.utils.StringUtils;
			import com.ruoyi.system.service.ISysUserService;
			import org.slf4j.Logger;
			import org.slf4j.LoggerFactory;
			import org.springframework.beans.factory.annotation.Autowired;
			@@ -13,6 +7,12 @@
			import org.springframework.security.core.userdetails.UserDetailsService;
			import org.springframework.security.core.userdetails.UsernameNotFoundException;
			import org.springframework.stereotype.Service;
			import com.ruoyi.common.core.domain.entity.SysUser;
			import com.ruoyi.common.core.domain.model.LoginUser;
			import com.ruoyi.common.enums.UserStatus;
			import com.ruoyi.common.exception.ServiceException;
			import com.ruoyi.common.utils.StringUtils;
			import com.ruoyi.system.service.ISysUserService;

			/**
			* 用户验证处理
			@@ -37,17 +37,17 @@
			if (StringUtils.isNull(user))
			{
			log.info("登录用户：{} 不存在.", username);
			throw new UsernameNotFoundException("登录用户：" + username + " 不存在");
			throw new ServiceException("登录用户：" + username + " 不存在");
			}
			else if (UserStatus.DELETED.getCode().equals(user.getDelFlag()))
			{
			log.info("登录用户：{} 已被删除.", username);
			throw new BaseException("对不起，您的账号：" + username + " 已被删除");
			throw new ServiceException("对不起，您的账号：" + username + " 已被删除");
			}
			else if (UserStatus.DISABLE.getCode().equals(user.getStatus()))
			{
			log.info("登录用户：{} 已被停用.", username);
			throw new BaseException("对不起，您的账号：" + username + " 已停用");
			throw new ServiceException("对不起，您的账号：" + username + " 已停用");
			}

			return createLoginUser(user);
			@@ -55,6 +55,6 @@

			public UserDetails createLoginUser(SysUser user)
			{
			return new LoginUser(user, permissionService.getMenuPermission(user));
			return new LoginUser(user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user));
			}
			}