fix: 公司邮箱模块bug修复，涉及邮箱分割和备注保存

service-base/src/main/java/com/simuwang/base/pojo/vo/CompanyEmailConfigVO.java

@@ -39,6 +39,6 @@ public class CompanyEmailConfigVO {
     /**
      * 备注信息
      */
-    private String remark;
+    private String sendRemark;
 
 }

service-base/src/main/resources/mapper/CompanyEmailConfigMapper.xml

@@ -84,7 +84,7 @@
         <result column="company_name" property="companyName"/>
         <result column="email" property="email"/>
         <result column="open_status" property="openStatus"/>
-        <result column="remark" property="remark"/>
+        <result column="remark" property="sendRemark"/>
     </resultMap>
     <select id="searchEmailConfig" resultMap="BaseVOMap">
         select id,company_id,company_name,email,open_status,remark from

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

@@ -32,6 +32,7 @@ public class CompanyEmailConfigServiceImpl implements CompanyEmailConfigService
                 emailConfigDO.setCompanyName(emailConfigVO.getCompanyName());
                 emailConfigDO.setEmail(emailConfigVO.getEmail());
                 emailConfigDO.setOpenStatus(emailConfigVO.getOpenStatus());
+                emailConfigDO.setRemark(emailConfigVO.getSendRemark());
                 emailConfigDO.setIsvalid(1);
                 emailConfigDO.setUpdateTime(new Date());
                 CompanyEmailConfigDO oldEmailConfigDO = companyEmailConfigMapper.selectEmailConfig(emailConfigVO.getCompanyId(),emailConfigVO.getEmail());

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

@@ -34,6 +34,9 @@ public class CompanyEmailSendHistoryServiceImpl implements CompanyEmailSendHisto
     public MybatisPage<CompanyEmailSendHistoryVO> searchCompanyEmail(CompanyEmailPageQuery companyEmailPageQuery) {
         List<CompanyEmailSendHistoryDO> dataList = companyEmailSendHistoryMapper.searchCompanyEmailList(companyEmailPageQuery);
         List<CompanyEmailSendHistoryVO> voList = dataList.stream().map(CompanyEmailSendHistoryDO::toVo).collect(Collectors.toList());
+        for(CompanyEmailSendHistoryVO vo : voList){
+            vo.setEmail(vo.getEmail().replaceAll(",",";"));
+        }
         long total = companyEmailSendHistoryMapper.countCompanyEmailList(companyEmailPageQuery);
         return MybatisPage.of(total, voList);
     }
@@ -68,9 +71,6 @@ public class CompanyEmailSendHistoryServiceImpl implements CompanyEmailSendHisto
     @Override
     public MybatisPage<CompanyEmailConfigVO> searchEmailConfig(CompanyEmailHistoryPageQuery companyEmailHistoryPageQuery) {
         List<CompanyEmailConfigVO> emailList = companyEmailConfigMapper.searchEmailConfig(companyEmailHistoryPageQuery);
-        for(CompanyEmailConfigVO vo : emailList){
-            vo.setEmail(vo.getEmail().replaceAll(",",";"));
-        }
         long total = companyEmailConfigMapper.countEmailConfig(companyEmailHistoryPageQuery);
         return MybatisPage.of(total,emailList);
     }