From 7306feb6ef771bce42a9df846284ad6f57efb45c Mon Sep 17 00:00:00 2001
From: hewenqiang <1527468660@qq.com>
Date: Thu, 20 Jan 2022 15:24:38 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=A0=A1=E9=AA=8C=E6=96=B9=E6=B3=95=E3=80=82?=
 =?UTF-8?q?=201.=20=E6=A0=A1=E9=AA=8C=E7=94=A8=E6=88=B7=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=94=AF=E4=B8=80=E9=87=87=E7=94=A8baseMappe?=
 =?UTF-8?q?r.exists()=E6=96=B9=E6=B3=95=E5=88=A4=E6=96=AD=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E5=AD=98=E5=9C=A8=E3=80=82=202.=20=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E7=A0=81=E5=92=8C=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?email=E6=98=AF=E5=90=A6=E5=94=AF=E4=B8=80=EF=BC=8C=E5=BD=93?=
 =?UTF-8?q?=E5=AD=98=E5=9C=A8userId=E6=97=B6=EF=BC=8Csql=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=89=8D=E5=8A=A0=E4=B8=8A=E4=B8=8D=E7=AD=89?=
 =?UTF-8?q?=E4=BA=8E=E5=BD=93=E5=89=8DuserId=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SysUserServiceImpl.java      | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index dfa606cf2..1dbbf7a2d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -1,6 +1,7 @@
 package com.ruoyi.system.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -146,8 +147,8 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
      */
     @Override
     public String checkUserNameUnique(String userName) {
-        long count = baseMapper.selectCount(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUserName, userName));
-        if (count > 0) {
+        boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysUser>().eq(SysUser::getUserName, userName));
+        if (exist) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -161,11 +162,10 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
      */
     @Override
     public String checkPhoneUnique(SysUser user) {
-        Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
-        boolean count = baseMapper.exists(new LambdaQueryWrapper<SysUser>()
+        boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysUser>()
             .eq(SysUser::getPhonenumber, user.getPhonenumber())
-            .ne(SysUser::getUserId, userId));
-        if (count) {
+            .ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId()));
+        if (exist) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -179,11 +179,10 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
      */
     @Override
     public String checkEmailUnique(SysUser user) {
-        Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
-        boolean count = baseMapper.exists(new LambdaQueryWrapper<SysUser>()
+        boolean exist = baseMapper.exists(new LambdaQueryWrapper<SysUser>()
             .eq(SysUser::getEmail, user.getEmail())
-            .ne(SysUser::getUserId, userId));
-        if (count) {
+            .ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId()));
+        if (exist) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;