Merge branch 'test' of http://112.74.196.215:3000/Tech2/data-daq into test

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

@@ -77,6 +77,11 @@ public class CompanyEmailConfigServiceImpl implements CompanyEmailConfigService
                 if(!StringUtil.isNull(oldEmailConfigDO) && emailConfigVO.getId() == null){
                     msg.append(emailConfigVO.getCompanyName()+"已存在邮箱"+emailConfigVO.getEmail()).append(",");
                 }
+                if(!StringUtil.isNull(oldEmailConfigDO) && emailConfigVO.getId() != null){
+                    if(!oldEmailConfigDO.getId().equals(emailConfigVO.getId())){
+                        msg.append(emailConfigVO.getCompanyName()+"已存在邮箱"+emailConfigVO.getEmail()).append(",");
+                    }
+                }
             }
             if(StringUtil.isNotEmpty(msg.toString())){
                 vo.setMsg(msg.toString().substring(0,msg.length()-1));