|
@@ -105,9 +105,9 @@ public class SysController {
|
|
|
List<SysUser> sysUserList = null;
|
|
|
if (login.getType() == LoginTypeEnum.ACCOUNT) {//账号登录
|
|
|
// 非空校验
|
|
|
- Optional.ofNullable(login.getLoginName()).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("用户名不能为空"));
|
|
|
+ Optional.ofNullable(login.getLoginName()).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("手机号/账号不能为空"));
|
|
|
Optional.ofNullable(login.getPassword()).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("密码不能为空"));
|
|
|
- sysUserList = sysUserService.list(new QueryWrapper<SysUser>().lambda().eq(SysUser::getLoginName, login.getLoginName()));
|
|
|
+ sysUserList = sysUserService.list(new QueryWrapper<SysUser>().lambda().eq(SysUser::getLoginName, login.getLoginName()).or().eq(SysUser::getMobileNumber, login.getLoginName()));
|
|
|
if (CollectionUtils.isEmpty(sysUserList)) {
|
|
|
throw ExceptionResultEnum.ERROR.exception("用户不存在");
|
|
|
}
|