diff --git a/src/main/java/com/sczx/user/service/impl/UserServiceImpl.java b/src/main/java/com/sczx/user/service/impl/UserServiceImpl.java index 9283c95..3226e42 100644 --- a/src/main/java/com/sczx/user/service/impl/UserServiceImpl.java +++ b/src/main/java/com/sczx/user/service/impl/UserServiceImpl.java @@ -175,7 +175,7 @@ public class UserServiceImpl implements IUserService { //先根据openid查询用户,如果有则直接返回登录信息 LambdaQueryWrapper queryByOpenIdWrapper = new LambdaQueryWrapper<>(); - queryByOpenIdWrapper.eq(BaseUserPO::getWechatOpenid, openid).last(" limit 1"); + queryByOpenIdWrapper.eq(BaseUserPO::getWechatOpenid, openid).eq(BaseUserPO::getDelFlag, "0").last(" limit 1"); BaseUserPO baseUserPO = baseUserRepo.getOne(queryByOpenIdWrapper); if(Objects.nonNull(baseUserPO)){ return getLoginResponse(baseUserPO,MiniProgramTypeEnum.WECHAT); @@ -195,6 +195,7 @@ public class UserServiceImpl implements IUserService { boolean isNewUser = false; LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(BaseUserPO::getPhoneNumber, phoneNumber); + queryWrapper.eq(BaseUserPO::getDelFlag, "0"); baseUserPO = baseUserRepo.getOne(queryWrapper); if(Objects.isNull(baseUserPO)){ baseUserPO = new BaseUserPO(); @@ -260,7 +261,7 @@ public class UserServiceImpl implements IUserService { // 3. 查询用户是否存在 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(BaseUserPO::getPhoneNumber, phoneNumber); + queryWrapper.eq(BaseUserPO::getPhoneNumber, phoneNumber).eq(BaseUserPO::getDelFlag, "0"); BaseUserPO baseUserPO = baseUserRepo.getOne(queryWrapper); boolean isNewUser = false; @@ -319,9 +320,9 @@ public class UserServiceImpl implements IUserService { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); if(MiniProgramTypeEnum.WECHAT.getType().equalsIgnoreCase(programType)){ - queryWrapper.eq(BaseUserPO::getWechatOpenid, programId).last(" limit 1"); + queryWrapper.eq(BaseUserPO::getWechatOpenid, programId).eq(BaseUserPO::getDelFlag, "0").last(" limit 1"); }else { - queryWrapper.eq(BaseUserPO::getAlipayUserid, programId).last(" limit 1"); + queryWrapper.eq(BaseUserPO::getAlipayUserid, programId).eq(BaseUserPO::getDelFlag, "0").last(" limit 1"); } BaseUserPO baseUserPO = baseUserRepo.getOne(queryWrapper);