From 6e0c6608f2aa6b23253a77cc33dbf1b256b5707f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=86=AF=E5=87=AF?= <371894675@qq.com>
Date: Fri, 27 Oct 2023 10:34:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/controller/SysUserController.java  |  1 +
 .../system/server/mapper/SysUserMapper.java   |  9 +++++++++
 .../service/impl/SysUserServiceImpl.java      | 20 +++++++++++++++++--
 .../resources/mapper/system/SysUserMapper.xml | 11 ++++++++--
 4 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/base-system-server/src/main/java/com/health/system/server/controller/SysUserController.java b/base-system-server/src/main/java/com/health/system/server/controller/SysUserController.java
index 0b793a5..36c49ff 100644
--- a/base-system-server/src/main/java/com/health/system/server/controller/SysUserController.java
+++ b/base-system-server/src/main/java/com/health/system/server/controller/SysUserController.java
@@ -1,5 +1,6 @@
 package com.health.system.server.controller;
 
+import cn.hutool.core.lang.Assert;
 import com.health.common.core.domain.Result;
 import com.health.common.core.user.CommonBody;
 import com.health.common.core.utils.StringUtils;
diff --git a/base-system-server/src/main/java/com/health/system/server/mapper/SysUserMapper.java b/base-system-server/src/main/java/com/health/system/server/mapper/SysUserMapper.java
index a102c6c..acae0c8 100644
--- a/base-system-server/src/main/java/com/health/system/server/mapper/SysUserMapper.java
+++ b/base-system-server/src/main/java/com/health/system/server/mapper/SysUserMapper.java
@@ -171,4 +171,13 @@ public interface SysUserMapper {
     Patient selectPatient(@Param("userId") Integer userId);
 
     Doctor selectDoctor(@Param("userId") Integer userId);
+
+    /**
+     * @description:  核对邮箱是否已经注册过
+     * @param:  * @param email
+     * @return: void
+     * @author 冯凯
+     * @date: 2023/10/27 10:01
+     */
+    User checkEmail(@Param("email") String email);
 }
diff --git a/base-system-server/src/main/java/com/health/system/server/service/impl/SysUserServiceImpl.java b/base-system-server/src/main/java/com/health/system/server/service/impl/SysUserServiceImpl.java
index b92b732..6261211 100644
--- a/base-system-server/src/main/java/com/health/system/server/service/impl/SysUserServiceImpl.java
+++ b/base-system-server/src/main/java/com/health/system/server/service/impl/SysUserServiceImpl.java
@@ -1,5 +1,6 @@
 package com.health.system.server.service.impl;
 
+import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.RandomUtil;
 import com.health.common.core.constant.UserConstants;
 import com.health.common.core.domain.Result;
@@ -607,8 +608,10 @@ public class SysUserServiceImpl implements ISysUserService
     @Override
     @Transactional
     public Boolean registerDoctor(Doctor doctor) {
+
+            checkEmail(doctor.getEmail());
             Integer roleId=100;
-        //添加用户表
+            //添加用户表
             int count=userMapper.registerDoctor(doctor);
             Integer userId = doctor.getUserId();
             Doctor doctor1 = new Doctor();
@@ -618,14 +621,27 @@ public class SysUserServiceImpl implements ISysUserService
             doctor1.setPersonalFile(doctor.getPersonalFile());
             doctor1.setInauguralHospital(doctor.getInauguralHospital());
            doctor1.setGoodFiled(doctor.getGoodFiled());
+           //添加医生表
             userMapper.insertDoctor(doctor1);
-
+            //添加用户和角色中间表
             int i=userMapper.insertUseRole(userId,roleId);
             return i>0;
         //成功之后添加医生表
         //添加用户角色中间表
     }
 
+    /**
+     * @description:  核对邮箱是否已经注册过
+     * @param:  * @param email
+     * @return: void
+     * @author 冯凯
+     * @date: 2023/10/27 10:01
+     */
+    private void checkEmail(String email) {
+        User user=userMapper.checkEmail(email);
+        Assert.isNull(user,"邮箱{}已经注册,请重新输入邮箱"+email);
+    }
+
     //---------------注册医生---------------------------
     @Override
     @Transactional
diff --git a/base-system-server/src/main/resources/mapper/system/SysUserMapper.xml b/base-system-server/src/main/resources/mapper/system/SysUserMapper.xml
index c6c8352..45f8ed9 100644
--- a/base-system-server/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/base-system-server/src/main/resources/mapper/system/SysUserMapper.xml
@@ -45,7 +45,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="dataScope"    column="data_scope"     />
         <result property="status"       column="role_status"    />
     </resultMap>
-
+	<sql id="selectUser">
+		select user_id,name,email,avatar,status from tb_user
+	</sql>
 	<sql id="selectUserVo">
         select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,
         d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
@@ -155,8 +157,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	<select id="selectDoctor" resultType="com.health.system.common.domain.Doctor">
 		select * from tb_doctor where doctor_id=#{userId}
 	</select>
+    <select id="checkEmail" resultType="com.health.system.common.domain.User">
+		<include refid="selectUser">
+			where email=#{email}
+		</include>
+	</select>
 
-	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
+    <insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
  		insert into sys_user(
  			<if test="userId != null and userId != 0">user_id,</if>
  			<if test="deptId != null and deptId != 0">dept_id,</if>