From faa56d16b92cbdb8f7e16c8b43c2916ae692d881 Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Mon, 29 Apr 2024 22:16:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=82=AE=E7=AE=B1=E3=80=81=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E5=8F=B7=E6=97=B6=E6=9C=AA=E8=87=AA=E5=8A=A8=E5=8A=A0=E5=AF=86?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/system/mapper/UserMapper.java        | 16 ++++++++++++++++
 .../system/service/impl/UserServiceImpl.java   | 12 ++++++------
 .../src/main/resources/mapper/UserMapper.xml   | 18 ++++++++++++++++++
 3 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/UserMapper.java b/continew-admin-system/src/main/java/top/continew/admin/system/mapper/UserMapper.java
index 3d1bc209..055aaaa6 100644
--- a/continew-admin-system/src/main/java/top/continew/admin/system/mapper/UserMapper.java
+++ b/continew-admin-system/src/main/java/top/continew/admin/system/mapper/UserMapper.java
@@ -65,4 +65,20 @@ public interface UserMapper extends DataPermissionMapper<UserDO> {
      */
     @Select("SELECT nickname FROM sys_user WHERE id = #{id}")
     String selectNicknameById(@Param("id") Long id);
+
+    /**
+     * 根据邮箱查询数量
+     *
+     * @param email 邮箱
+     * @return 用户数量
+     */
+    Long selectCountByEmail(@FieldEncrypt @Param("email") String email, @Param("id") Long id);
+
+    /**
+     * 根据手机号查询数量
+     *
+     * @param phone 手机号
+     * @return 用户数量
+     */
+    Long selectCountByPhone(@FieldEncrypt @Param("phone") String phone, @Param("id") Long id);
 }
diff --git a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java
index 91ccade8..723a9cee 100644
--- a/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java
+++ b/continew-admin-system/src/main/java/top/continew/admin/system/service/impl/UserServiceImpl.java
@@ -217,8 +217,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserRes
     public void updatePhone(String newPhone, String currentPassword, Long id) {
         UserDO user = super.getById(id);
         CheckUtils.throwIf(!passwordEncoder.matches(currentPassword, user.getPassword()), "当前密码错误");
-        Long count = baseMapper.lambdaQuery().eq(UserDO::getPhone, newPhone).count();
-        CheckUtils.throwIf(count > 0, "手机号已绑定其他账号，请更换其他手机号");
+        CheckUtils.throwIf(this.isPhoneExists(newPhone, id), "手机号已绑定其他账号，请更换其他手机号");
         CheckUtils.throwIfEqual(newPhone, user.getPhone(), "新手机号不能与当前手机号相同");
         // 更新手机号
         baseMapper.lambdaUpdate().set(UserDO::getPhone, newPhone).eq(UserDO::getId, id).update();
@@ -228,8 +227,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserRes
     public void updateEmail(String newEmail, String currentPassword, Long id) {
         UserDO user = super.getById(id);
         CheckUtils.throwIf(!passwordEncoder.matches(currentPassword, user.getPassword()), "当前密码错误");
-        Long count = baseMapper.lambdaQuery().eq(UserDO::getEmail, newEmail).count();
-        CheckUtils.throwIf(count > 0, "邮箱已绑定其他账号，请更换其他邮箱");
+        CheckUtils.throwIf(this.isEmailExists(newEmail, id), "邮箱已绑定其他账号，请更换其他邮箱");
         CheckUtils.throwIfEqual(newEmail, user.getEmail(), "新邮箱不能与当前邮箱相同");
         // 更新邮箱
         baseMapper.lambdaUpdate().set(UserDO::getEmail, newEmail).eq(UserDO::getId, id).update();
@@ -296,7 +294,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserRes
      * @return 是否存在
      */
     private boolean isEmailExists(String email, Long id) {
-        return baseMapper.lambdaQuery().eq(UserDO::getEmail, email).ne(null != id, UserDO::getId, id).exists();
+        Long count = baseMapper.selectCountByEmail(email, id);
+        return null != count && count > 0;
     }
 
     /**
@@ -307,6 +306,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserRes
      * @return 是否存在
      */
     private boolean isPhoneExists(String phone, Long id) {
-        return baseMapper.lambdaQuery().eq(UserDO::getPhone, phone).ne(null != id, UserDO::getId, id).exists();
+        Long count = baseMapper.selectCountByPhone(phone, id);
+        return null != count && count > 0;
     }
 }
diff --git a/continew-admin-system/src/main/resources/mapper/UserMapper.xml b/continew-admin-system/src/main/resources/mapper/UserMapper.xml
index b530ced4..65b54f17 100644
--- a/continew-admin-system/src/main/resources/mapper/UserMapper.xml
+++ b/continew-admin-system/src/main/resources/mapper/UserMapper.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="top.continew.admin.system.mapper.UserMapper">
+
+    <select id="selectCountByEmail" resultType="java.lang.Long">
+        SELECT count(*)
+        FROM sys_user
+        WHERE email = #{email}
+          <if test="id != null">
+            AND id != #{id}
+          </if>
+    </select>
+
+    <select id="selectCountByPhone" resultType="java.lang.Long">
+        SELECT count(*)
+        FROM sys_user
+        WHERE phone = #{phone}
+        <if test="id != null">
+            AND id != #{id}
+        </if>
+    </select>
 </mapper>
\ No newline at end of file