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

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

@@ -72,6 +72,17 @@ public class CompanyEmailConfigServiceImpl implements CompanyEmailConfigService
         StringBuffer msg = new StringBuffer();
         try{
             for(CompanyEmailConfigVO emailConfigVO : companyEmailConfigVOS){
+                CompanyEmailConfigDO oldEmailConfigDO = companyEmailConfigMapper.selectEmailConfig(emailConfigVO.getCompanyId(),emailConfigVO.getEmail());
+                if(!StringUtil.isNull(oldEmailConfigDO) && emailConfigVO.getId() == null){
+                    msg.append(emailConfigVO.getCompanyName()+"已存在邮箱"+emailConfigVO.getEmail()).append(",");
+                }
+            }
+            if(StringUtil.isNotEmpty(msg.toString())){
+                vo.setMsg(msg.toString().substring(0,msg.length()-1));
+                vo.setData(false);
+                return vo;
+            }
+            for(CompanyEmailConfigVO emailConfigVO : companyEmailConfigVOS){
                 CompanyEmailConfigDO emailConfigDO = new CompanyEmailConfigDO();
                 emailConfigDO.setCompanyId(emailConfigVO.getCompanyId());
                 emailConfigDO.setCompanyName(emailConfigVO.getCompanyName());
@@ -80,11 +91,6 @@ public class CompanyEmailConfigServiceImpl implements CompanyEmailConfigService
                 emailConfigDO.setRemark(emailConfigVO.getSendRemark());
                 emailConfigDO.setIsvalid(1);
                 emailConfigDO.setUpdateTime(new Date());
-                CompanyEmailConfigDO oldEmailConfigDO = companyEmailConfigMapper.selectEmailConfig(emailConfigVO.getCompanyId(),emailConfigVO.getEmail());
-                if(!StringUtil.isNull(oldEmailConfigDO) && emailConfigDO.getId() == null){
-                    msg.append(emailConfigVO.getCompanyName()+"已存在邮箱"+emailConfigVO.getEmail()).append(",");
-                    continue;
-                }
                 if(emailConfigVO.getId() != null){
                     emailConfigDO.setId(emailConfigVO.getId());
                     companyEmailConfigMapper.updateCompanyEmailConfig(emailConfigDO);
@@ -93,10 +99,7 @@ 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){
 
         }