查询用户要取未逻辑删除的用户
This commit is contained in:
@ -175,7 +175,7 @@ public class UserServiceImpl implements IUserService {
|
|||||||
|
|
||||||
//先根据openid查询用户,如果有则直接返回登录信息
|
//先根据openid查询用户,如果有则直接返回登录信息
|
||||||
LambdaQueryWrapper<BaseUserPO> queryByOpenIdWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<BaseUserPO> 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);
|
BaseUserPO baseUserPO = baseUserRepo.getOne(queryByOpenIdWrapper);
|
||||||
if(Objects.nonNull(baseUserPO)){
|
if(Objects.nonNull(baseUserPO)){
|
||||||
return getLoginResponse(baseUserPO,MiniProgramTypeEnum.WECHAT);
|
return getLoginResponse(baseUserPO,MiniProgramTypeEnum.WECHAT);
|
||||||
@ -195,6 +195,7 @@ public class UserServiceImpl implements IUserService {
|
|||||||
boolean isNewUser = false;
|
boolean isNewUser = false;
|
||||||
LambdaQueryWrapper<BaseUserPO> queryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<BaseUserPO> queryWrapper = new LambdaQueryWrapper<>();
|
||||||
queryWrapper.eq(BaseUserPO::getPhoneNumber, phoneNumber);
|
queryWrapper.eq(BaseUserPO::getPhoneNumber, phoneNumber);
|
||||||
|
queryWrapper.eq(BaseUserPO::getDelFlag, "0");
|
||||||
baseUserPO = baseUserRepo.getOne(queryWrapper);
|
baseUserPO = baseUserRepo.getOne(queryWrapper);
|
||||||
if(Objects.isNull(baseUserPO)){
|
if(Objects.isNull(baseUserPO)){
|
||||||
baseUserPO = new BaseUserPO();
|
baseUserPO = new BaseUserPO();
|
||||||
@ -260,7 +261,7 @@ public class UserServiceImpl implements IUserService {
|
|||||||
|
|
||||||
// 3. 查询用户是否存在
|
// 3. 查询用户是否存在
|
||||||
LambdaQueryWrapper<BaseUserPO> queryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<BaseUserPO> queryWrapper = new LambdaQueryWrapper<>();
|
||||||
queryWrapper.eq(BaseUserPO::getPhoneNumber, phoneNumber);
|
queryWrapper.eq(BaseUserPO::getPhoneNumber, phoneNumber).eq(BaseUserPO::getDelFlag, "0");
|
||||||
BaseUserPO baseUserPO = baseUserRepo.getOne(queryWrapper);
|
BaseUserPO baseUserPO = baseUserRepo.getOne(queryWrapper);
|
||||||
|
|
||||||
boolean isNewUser = false;
|
boolean isNewUser = false;
|
||||||
@ -319,9 +320,9 @@ public class UserServiceImpl implements IUserService {
|
|||||||
|
|
||||||
LambdaQueryWrapper<BaseUserPO> queryWrapper = new LambdaQueryWrapper<>();
|
LambdaQueryWrapper<BaseUserPO> queryWrapper = new LambdaQueryWrapper<>();
|
||||||
if(MiniProgramTypeEnum.WECHAT.getType().equalsIgnoreCase(programType)){
|
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 {
|
}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);
|
BaseUserPO baseUserPO = baseUserRepo.getOne(queryWrapper);
|
||||||
|
|||||||
Reference in New Issue
Block a user