Merge remote-tracking branch 'origin/master'

feige

2025-06-23 8d0db2a5b91a38960855ab3f5ee3e92fe363e8e2

 ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java

@@ -36,7 +36,7 @@
    @Override
    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException
    {
        SysUser user = userService.selectUserByUserName(username);
        SysUser user = userService.selectUserByNickName(username);
        if (StringUtils.isNull(user))
        {
            log.info("登录用户：{} 不存在.", username);
@@ -52,6 +52,11 @@
            log.info("登录用户：{} 已被停用.", username);
            throw new ServiceException("对不起，您的账号：" + username + " 已停用");
        }
        else if (UserStatus.ABNORMAL.getCode().equals(user.getStatus()))
        {
            log.info("登录用户：{} 异常.", username);
            throw new ServiceException("对不起，您的账号：" + username + " 出现异常，请联系管理员");
        }

        passwordService.validate(user);

@@ -60,6 +65,8 @@

    public UserDetails createLoginUser(SysUser user)
    {
     //   System.out.println(user);
      //  System.out.println("========--0023233333333333333");
        return new LoginUser(user.getUserId(), user.getDeptId(), user, permissionService.getMenuPermission(user));
    }
}