From bd732736b0b087abce01ce3a5960f488e1e7a8a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com>
Date: Thu, 14 Sep 2023 17:03:18 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E8=A7=A3=E6=9E=90=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/controller/mailGather/EmailMaintainController.java | 2 +-
 .../java/com/dxhy/core/dao/mailGather/EmailMaintainDao.java | 1 +
 .../dxhy/core/service/mailGather/EmailMaintainService.java  | 2 ++
 .../service/mailGather/impl/EmailMaintainServiceImpl.java   | 5 +++++
 .../resources/mapper/mailGather/EmailMaintainMapper.xml     | 6 ++++++
 .../resources/mapper/mailGather/MailGatherLogMapper.xml     | 3 +++
 6 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java b/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java
index 071e8352..9f7661e9 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java
@@ -141,7 +141,7 @@ public class EmailMaintainController extends AbstractController  {
             data.put("data", "");
             return ResponseEntity.ok(data);
         }
-        int count = emailMaintainService.selectByEmail(emailMaintain.getEmailAddress());
+        int count = emailMaintainService.selectByEmailAddressAndId(emailMaintain);
         if(count>0){
             return ResponseEntity.ok(R.error("邮箱地址已存在！"));
         }
diff --git a/dxhy-core/src/main/java/com/dxhy/core/dao/mailGather/EmailMaintainDao.java b/dxhy-core/src/main/java/com/dxhy/core/dao/mailGather/EmailMaintainDao.java
index 4f58914a..5a55c27f 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/dao/mailGather/EmailMaintainDao.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/dao/mailGather/EmailMaintainDao.java
@@ -90,4 +90,5 @@ public interface EmailMaintainDao extends BaseMapper<EmailMaintainVo> {
     String getUserName(@Param("userCode") String userCode);
     String getUserByUsername(@Param("username") String username);
 
+    int selectEmailWithId(@Param("email") EmailMaintainVo emailMaintainVo);
 }
diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/EmailMaintainService.java b/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/EmailMaintainService.java
index 9db4ec0f..2457d882 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/EmailMaintainService.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/EmailMaintainService.java
@@ -56,4 +56,6 @@ public interface EmailMaintainService {
     int selectByEmail(String email);
 
     EmailMaintainVo getEmailMaintainVo(EmailMaintainVo emailMaintain);
+
+    int selectByEmailAddressAndId(EmailMaintainVo emailMaintainVo);
 }
diff --git a/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java b/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java
index 4c1a166e..96e69b24 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/service/mailGather/impl/EmailMaintainServiceImpl.java
@@ -144,6 +144,11 @@ public class EmailMaintainServiceImpl implements EmailMaintainService {
         return emailMaintainDao.getEmailMaintainVo(emailMaintain);
     }
 
+    @Override
+    public int selectByEmailAddressAndId(EmailMaintainVo emailMaintainVo) {
+        return emailMaintainDao.selectEmailWithId(emailMaintainVo);
+    }
+
     //根据用户名进行查询
     public void getdeptInfo(String deptId){
         DynamicContextHolder.push(DbConstant.BASICS_READ);
diff --git a/dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml b/dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml
index 19eaa752..f7ba5c48 100644
--- a/dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/mailGather/EmailMaintainMapper.xml
@@ -176,5 +176,11 @@
         select count(1) from email_maintain where email_address = #{email}
     </select>
 
+    <select id="selectEmailWithId"  resultType="int" parameterType="com.dxhy.core.model.mailGather.EmailMaintainVo">
+        select count(1)
+        from email_maintain
+        where email_address = #{email.emailAddress}
+        and id != #{email.id}
+    </select>
 </mapper>
 
diff --git a/dxhy-core/src/main/resources/mapper/mailGather/MailGatherLogMapper.xml b/dxhy-core/src/main/resources/mapper/mailGather/MailGatherLogMapper.xml
index eb3bf18f..b6657704 100644
--- a/dxhy-core/src/main/resources/mapper/mailGather/MailGatherLogMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/mailGather/MailGatherLogMapper.xml
@@ -34,6 +34,9 @@
         mail_gather_log m
         LEFT JOIN email_maintain e ON m.from_address = e.email_address
         <where>
+            <if test="companyCode != null and companyCode != ''">
+                and e.company_code = #{companyCode}
+            </if>
             <if test="deptId != null and deptId != ''">
                 and e.dept_id = #{deptId}
             </if>