From 5b325963dc14a09c62e006a2d726d14d9d38347d Mon Sep 17 00:00:00 2001
From: zhangli <123879394@qq.com>
Date: Sun, 21 Sep 2025 01:00:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7=E8=A6=81?=
 =?UTF-8?q?=E5=8F=96=E6=9C=AA=E9=80=BB=E8=BE=91=E5=88=A0=E9=99=A4=E7=9A=84?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/sczx/user/service/impl/UserServiceImpl.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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<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);
             if(Objects.nonNull(baseUserPO)){
                 return getLoginResponse(baseUserPO,MiniProgramTypeEnum.WECHAT);
@@ -195,6 +195,7 @@ public class UserServiceImpl implements IUserService {
             boolean isNewUser = false;
             LambdaQueryWrapper<BaseUserPO> 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<BaseUserPO> 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<BaseUserPO> 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);