|
@@ -80,7 +80,8 @@ public class ZhcxLoginServiceImpl implements ZhcxLoginService {
|
|
|
LambdaQueryWrapper<SysUserDo> queryWrapper = Wrappers.lambdaQuery();
|
|
|
queryWrapper.and(i -> i.eq(SysUserDo::getAccount, account).
|
|
|
or().eq(SysUserDo::getMobile, account).
|
|
|
- or().eq(SysUserDo::getEmail, account));
|
|
|
+ or().eq(SysUserDo::getEmail, account))
|
|
|
+ .ne(SysUserDo::getEnabled, "0");
|
|
|
SysUserDo sysUserDo = sysUserService.getOne(queryWrapper);
|
|
|
if (sysUserDo == null || StringUtils.isEmpty(sysUserDo.getId())) {
|
|
|
return R.error("用户名密码不正确");
|