fix: 13424 一个家机构新增了两个相同的邮箱，应该限制不能重复添加同一个邮箱问题修复

service-manage/src/main/java/com/simuwang/manage/api/company/CompanyEmailSendHistoryController.java

@@ -91,9 +91,9 @@ public class CompanyEmailSendHistoryController{
      * @return
      */
     @PostMapping("save-email-config")
-    public boolean saveCompanyEmailConfig(@RequestBody List<CompanyEmailConfigVO> companyEmailConfigVOList){
-        companyEmailConfigService.saveCompanyEmailConfig(companyEmailConfigVOList);
-        return true;
+    public ResultVo saveCompanyEmailConfig(@RequestBody List<CompanyEmailConfigVO> companyEmailConfigVOList){
+        ResultVo vo = companyEmailConfigService.saveCompanyEmailConfig(companyEmailConfigVOList);
+        return vo;
     }
 
     /**

service-manage/src/main/java/com/simuwang/manage/service/CompanyEmailConfigService.java

@@ -1,6 +1,7 @@
 package com.simuwang.manage.service;
 
 import com.simuwang.base.pojo.vo.CompanyEmailConfigVO;
+import com.smppw.common.pojo.ResultVo;
 
 import java.util.List;
 
@@ -12,7 +13,7 @@ import java.util.List;
  */
 public interface CompanyEmailConfigService {
 
-    void saveCompanyEmailConfig(List<CompanyEmailConfigVO> companyEmailConfigVOS);
+    ResultVo saveCompanyEmailConfig(List<CompanyEmailConfigVO> companyEmailConfigVOS);
 
     void deleteCompanyEmailConfig(Integer id);
 

service-manage/src/main/java/com/simuwang/manage/service/impl/CompanyEmailConfigServiceImpl.java

@@ -18,6 +18,7 @@ import com.simuwang.base.pojo.dto.ExcelDeletionInfoDTO;
 import com.simuwang.base.pojo.dto.MailboxInfoDTO;
 import com.simuwang.base.pojo.vo.CompanyEmailConfigVO;
 import com.simuwang.manage.service.CompanyEmailConfigService;
+import com.smppw.common.pojo.ResultVo;
 import jakarta.annotation.Resource;
 import jakarta.mail.Message;
 import jakarta.mail.Store;
@@ -65,7 +66,10 @@ public class CompanyEmailConfigServiceImpl implements CompanyEmailConfigService
     @Value("${spring.mail.protocol}")
     private String protocol;
     @Override
-    public void saveCompanyEmailConfig(List<CompanyEmailConfigVO> companyEmailConfigVOS) {
+    public ResultVo saveCompanyEmailConfig(List<CompanyEmailConfigVO> companyEmailConfigVOS) {
+        ResultVo vo = new ResultVo(com.smppw.common.pojo.enums.status.ResultCode.SAVE_SUCCESS);
+        vo.setData(true);
+        StringBuffer msg = new StringBuffer();
         try{
             for(CompanyEmailConfigVO emailConfigVO : companyEmailConfigVOS){
                 CompanyEmailConfigDO emailConfigDO = new CompanyEmailConfigDO();
@@ -77,8 +81,9 @@ public class CompanyEmailConfigServiceImpl implements CompanyEmailConfigService
                 emailConfigDO.setIsvalid(1);
                 emailConfigDO.setUpdateTime(new Date());
                 CompanyEmailConfigDO oldEmailConfigDO = companyEmailConfigMapper.selectEmailConfig(emailConfigVO.getCompanyId(),emailConfigVO.getEmail());
-                if(!StringUtil.isNull(oldEmailConfigDO)){
-                    emailConfigVO.setId(oldEmailConfigDO.getId());
+                if(!StringUtil.isNull(oldEmailConfigDO) && emailConfigDO.getId() == null){
+                    msg.append(emailConfigVO.getCompanyName()+"已存在邮箱"+emailConfigVO.getEmail()).append(",");
+                    continue;
                 }
                 if(emailConfigVO.getId() != null){
                     emailConfigDO.setId(emailConfigVO.getId());
@@ -88,9 +93,14 @@ public class CompanyEmailConfigServiceImpl implements CompanyEmailConfigService
                     companyEmailConfigMapper.saveCompanyEmailConfig(emailConfigDO);
                 }
             }
+            if(StringUtil.isNotEmpty(msg.toString())){
+                vo.setMsg(msg.toString().substring(0,msg.length()-1));
+                vo.setData(false);
+            }
         }catch (Exception e){
 
         }
+        return vo;
     }
 
     @Override