邮箱解析编辑问题

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("邮箱地址已存在！"));
         }

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);
 }

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);
 }

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);

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>
 

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>