From 8d3a6e11aa20a6ed5e5e18601dbec740aae3f99c Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Mon, 29 Jan 2024 16:39:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E4=BF=AE=E6=94=B9=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=94=B5=E8=AF=9D=E6=88=96=E9=82=AE=E7=AE=B1=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../peanut/modules/book/service/impl/MyUserServiceImpl.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/peanut/modules/book/service/impl/MyUserServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/MyUserServiceImpl.java
index 5986f531..2ca5337e 100644
--- a/src/main/java/com/peanut/modules/book/service/impl/MyUserServiceImpl.java
+++ b/src/main/java/com/peanut/modules/book/service/impl/MyUserServiceImpl.java
@@ -10,6 +10,7 @@ import com.aliyun.teautil.Common;
 import com.aliyun.teautil.models.RuntimeOptions;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.google.common.collect.Maps;
 import com.peanut.common.utils.*;
 import com.peanut.config.DelayQueueConfig;
@@ -435,7 +436,7 @@ public class MyUserServiceImpl extends ServiceImpl<MyUserDao, MyUserEntity> impl
     public boolean checkUserTelOrEmail(MyUserEntity user) {
         LambdaQueryWrapper<MyUserEntity> wrapper = new LambdaQueryWrapper<>();
         wrapper.ne(MyUserEntity::getId,user.getId());
-        wrapper.eq(MyUserEntity::getTel,user.getTel()).or().eq(MyUserEntity::getEmail,user.getEmail());
+        wrapper.and(l->l.eq(StringUtils.isNotBlank(user.getTel()),MyUserEntity::getTel,user.getTel()).or().eq(StringUtils.isNotBlank(user.getEmail()),MyUserEntity::getEmail,user.getEmail()));
         MyUserEntity one = getOne(wrapper);
         return one == null;
     }