Merge remote-tracking branch 'origin/master'

cuilei

2025-06-11 cd00884c3db8fa6808b3b5949ab1a2b1459d6bdc

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java

@@ -121,7 +121,7 @@
      }
      SysUser sysUser = sysUserService.getOne(queryWrapper);
      //update-end-author:wangshuai date:20200601 for: 登录代码验证用户是否注销bug，if条件永远为false
      result = sysUserService.checkUserIsEffective(sysUser);
      result = sysUserService.checkUserIsEffective(sysUser, loginType);
      if(!result.isSuccess()) {
         return result;
      }
@@ -397,7 +397,7 @@
         }else {
            //登录模式，校验用户有效性
            SysUser sysUser = sysUserService.getUserByPhone(mobile);
            result = sysUserService.checkUserIsEffective(sysUser);
            result = sysUserService.checkUserIsEffective(sysUser, null);
            if(!result.isSuccess()) {
               String message = result.getMessage();
               String userNotExist="该用户不存在，请注册";
@@ -458,7 +458,7 @@

      //校验用户有效性
      SysUser sysUser = sysUserService.getUserByPhone(phone);
      result = sysUserService.checkUserIsEffective(sysUser);
      result = sysUserService.checkUserIsEffective(sysUser, null);
      if(!result.isSuccess()) {
         return result;
      }
@@ -626,7 +626,7 @@

      //1. 校验用户是否有效
      SysUser sysUser = sysUserService.getUserByName(username);
      result = sysUserService.checkUserIsEffective(sysUser);
      result = sysUserService.checkUserIsEffective(sysUser, null);
      if(!result.isSuccess()) {
         return result;
      }