From 9f3a40aade8c7c137d7961b116f9ae6e21d1f355 Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Wed, 30 Jul 2025 10:31:34 +0800
Subject: [PATCH] =?UTF-8?q?fix(portal):=20=E5=A2=9E=E5=8A=A0=E8=8A=B1?=
 =?UTF-8?q?=E5=90=8D=E5=86=8C=E9=82=AE=E7=AE=B1=E9=87=8D=E5=A4=8D=E6=80=A7?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5-=20=E5=9C=A8=20EmailAccountGenerateAction=20?=
 =?UTF-8?q?=E4=B8=AD=E6=B7=BB=E5=8A=A0=E6=A3=80=E6=9F=A5=E8=8A=B1=E5=90=8D?=
 =?UTF-8?q?=E5=86=8C=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8=E7=9B=B8=E5=90=8C?=
 =?UTF-8?q?=E9=82=AE=E7=AE=B1=E7=9A=84=E6=96=B9=E6=B3=95=20-=20=E5=9C=A8?=
 =?UTF-8?q?=20EmailAccountGenerateMapper=E6=8E=A5=E5=8F=A3=E4=B8=AD?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=20checkEmployeeSameEmail=20=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=20-=20=E5=9C=A8=20EmailAccountGenerateMapper.xml=20?=
 =?UTF-8?q?=E4=B8=AD=E6=B7=BB=E5=8A=A0=20checkEmployeeSameEmail=20?=
 =?UTF-8?q?=E7=9A=84=20SQL=20=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entry/EmailAccountGenerateAction.java     | 20 +++++++++++++++++--
 .../entry/EmailAccountGenerateMapper.java     |  2 ++
 .../entry/EmailAccountGenerateMapper.xml      |  7 +++++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/weaver/seconddev/portal/action/entry/EmailAccountGenerateAction.java b/src/main/java/com/weaver/seconddev/portal/action/entry/EmailAccountGenerateAction.java
index 240da77..a954b45 100644
--- a/src/main/java/com/weaver/seconddev/portal/action/entry/EmailAccountGenerateAction.java
+++ b/src/main/java/com/weaver/seconddev/portal/action/entry/EmailAccountGenerateAction.java
@@ -61,7 +61,7 @@ public class EmailAccountGenerateAction implements EsbServerlessRpcRemoteInterfa
         String baseEmail = pinyinName + EMAIL_DOMAIN;
 
         // 首先检查基础邮箱是否已存在
-        if (!isEmailExists(baseEmail,requestId)) {
+        if (!isEmailExists(baseEmail, requestId)) {
             return baseEmail;
         }
 
@@ -77,13 +77,29 @@ public class EmailAccountGenerateAction implements EsbServerlessRpcRemoteInterfa
     }
 
     /**
-     * 检查邮箱是否已存在
+     * 检查入职管理表是否已存在相同邮箱
      *
      * @param email 邮箱账号
      * @return 是否存在
      */
     private boolean isEmailExists(String email, Long requestId) {
         Integer checkCount = emailAccountGenerateMapper.checkSameEmailAccount(baseParam, email, requestId);
+        boolean isSame = checkCount != null && checkCount > 0;
+        if (isSame) {
+            return true;
+        }
+        return isEmailExists(email);
+
+    }
+
+    /**
+     * 校验花名册是否存在相同邮箱
+     *
+     * @param email
+     * @return
+     */
+    private boolean isEmailExists(String email) {
+        Integer checkCount = emailAccountGenerateMapper.checkEmployeeSameEmail(baseParam, email);
         return checkCount != null && checkCount > 0;
     }
 }
diff --git a/src/main/java/com/weaver/seconddev/portal/mapper/action/entry/EmailAccountGenerateMapper.java b/src/main/java/com/weaver/seconddev/portal/mapper/action/entry/EmailAccountGenerateMapper.java
index ed03d26..4bc4246 100644
--- a/src/main/java/com/weaver/seconddev/portal/mapper/action/entry/EmailAccountGenerateMapper.java
+++ b/src/main/java/com/weaver/seconddev/portal/mapper/action/entry/EmailAccountGenerateMapper.java
@@ -13,4 +13,6 @@ import org.apache.ibatis.annotations.Param;
 public interface EmailAccountGenerateMapper {
 
     Integer checkSameEmailAccount(@Param("param") BaseParam param, @Param("email") String email, @Param("requestId") Long requestId);
+
+    Integer checkEmployeeSameEmail(@Param("param") BaseParam param, @Param("email") String email);
 }
diff --git a/src/main/resources/mapper/action/entry/EmailAccountGenerateMapper.xml b/src/main/resources/mapper/action/entry/EmailAccountGenerateMapper.xml
index e995e0f..5c3e69d 100644
--- a/src/main/resources/mapper/action/entry/EmailAccountGenerateMapper.xml
+++ b/src/main/resources/mapper/action/entry/EmailAccountGenerateMapper.xml
@@ -11,4 +11,11 @@
             and t1.form_data_id != #{requestId}
         </if>
     </select>
+
+    <select id="checkEmployeeSameEmail" resultType="java.lang.Integer">
+        select count(t1.id) from ${param.e10_common}.uf_jcl_employee_information t1
+        where t1.tenant_key = #{param.tenantKey}
+        <!--        and t1.delete_type = 0-->
+        and t1.email = #{email}
+    </select>
 </mapper>