diff --git a/src/main/java/com/yolo/keyborad/service/impl/UserServiceImpl.java b/src/main/java/com/yolo/keyborad/service/impl/UserServiceImpl.java index fbc4fe5..fb99bfe 100644 --- a/src/main/java/com/yolo/keyborad/service/impl/UserServiceImpl.java +++ b/src/main/java/com/yolo/keyborad/service/impl/UserServiceImpl.java @@ -84,6 +84,7 @@ public class UserServiceImpl extends ServiceImpl() .eq(KeyboardUser::getSubjectId, sub) + .eq(KeyboardUser::getDeleted, false) .eq(KeyboardUser::getStatus, false)); } @@ -107,6 +108,7 @@ public class UserServiceImpl extends ServiceImpl() .eq(KeyboardUser::getEmail, userLoginDTO.getMail()) + .eq(KeyboardUser::getDeleted, false) .eq(KeyboardUser::getStatus, false)); if (keyboardUser == null) { throw new BusinessException(ErrorCode.USER_NOT_FOUND); @@ -130,6 +132,7 @@ public class UserServiceImpl extends ServiceImpl() .eq(KeyboardUser::getId, loginIdAsLong) + .eq(KeyboardUser::getDeleted, false) .eq(KeyboardUser::getStatus, false)); if (keyboardUserDB == null) { throw new BusinessException(ErrorCode.USER_NOT_FOUND); diff --git a/src/main/java/com/yolo/keyborad/service/impl/user/UserRegistrationHandler.java b/src/main/java/com/yolo/keyborad/service/impl/user/UserRegistrationHandler.java index c99d5e7..8c96367 100644 --- a/src/main/java/com/yolo/keyborad/service/impl/user/UserRegistrationHandler.java +++ b/src/main/java/com/yolo/keyborad/service/impl/user/UserRegistrationHandler.java @@ -86,7 +86,8 @@ public class UserRegistrationHandler { private void ensureUserNotExists(String mailAddress) { KeyboardUser userMail = keyboardUserMapper.selectOne(new LambdaQueryWrapper() - .eq(KeyboardUser::getEmail, mailAddress)); + .eq(KeyboardUser::getEmail, mailAddress) + .eq(KeyboardUser::getDeleted, false)); if (userMail != null) { throw new BusinessException(ErrorCode.USER_HAS_EXISTED); }