fix: 公司邮箱模块bug修复，涉及频率和搜索

service-base/src/main/java/com/simuwang/base/mapper/CompanyEmailConfigMapper.java

@@ -33,4 +33,6 @@ public interface CompanyEmailConfigMapper extends BaseMapper<CompanyEmailConfigD
     long countEmailConfig(CompanyEmailHistoryPageQuery companyEmailHistoryPageQuery);
 
     List<CompanyEmailConfigVO> searchEmailConfigByCompanyId(@Param("companyId")String companyId);
+
+    CompanyEmailConfigDO selectEmailConfig(@Param("companyId")String companyId,@Param("email") String email);
 }

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

@@ -98,4 +98,8 @@
         select id,company_id,company_name,email,open_status,remark from
             PPW_EMAIL.company_email_config where isvalid =1 and company_id=#{companyId}
     </select>
+    <select id="selectEmailConfig"  resultMap="BaseVOMap">
+        select id,company_id,company_name,email,open_status,remark from
+            PPW_EMAIL.company_email_config where isvalid =1 and company_id=#{companyId} and email=#{email}
+    </select>
 </mapper>

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

@@ -56,10 +56,10 @@
             and f.fund_id like concat('%',#{fundId},'%')
         </if>
         <if test="fundShortName != null and fundShortName !=''">
-            and (f.fund_name like concat('%',#{fundShortName},'%') or f.fund_short_name like concat('%',#{fundShortName},'%'))
+            and (f.fund_name like concat('%',#{fundShortName},'%') or f.fund_short_name like concat('%',#{fundShortName},'%') or f.register_number like concat('%',#{fundShortName},'%'))
         </if>
         <if test="companyShortName != null and companyShortName !=''">
-            and (c.company_name like concat('%',#{companyShortName},'%') or c.company_short_name like concat('%',#{companyShortName},'%'))
+            and (c.company_name like concat('%',#{companyShortName},'%') or c.company_short_name like concat('%',#{companyShortName},'%')  or c.register_number like concat('%',#{companyShortName},'%'))
         </if>
         <if test="navFrequency != null and navFrequency !=''">
             and r.nav_frequency = #{navFrequency}
@@ -124,10 +124,10 @@
             and f.fund_id like concat('%',#{fundId},'%')
         </if>
         <if test="fundShortName != null and fundShortName !=''">
-            and (f.fund_name like concat('%',#{fundShortName},'%') or f.fund_short_name like concat('%',#{fundShortName},'%'))
+            and (f.fund_name like concat('%',#{fundShortName},'%') or f.fund_short_name like concat('%',#{fundShortName},'%')  or f.register_number like concat('%',#{fundShortName},'%'))
         </if>
         <if test="companyShortName != null and companyShortName !=''">
-            and (c.company_name like concat('%',#{companyShortName},'%') or c.company_short_name like concat('%',#{companyShortName},'%'))
+            and (c.company_name like concat('%',#{companyShortName},'%') or c.company_short_name like concat('%',#{companyShortName},'%')  or c.register_number like concat('%',#{companyShortName},'%'))
         </if>
         <if test="navFrequency != null and navFrequency !=''">
             and r.nav_frequency = #{navFrequency}

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

@@ -1,6 +1,7 @@
 package com.simuwang.manage.service.impl;
 
 import com.simuwang.base.common.enums.OpenStatusType;
+import com.simuwang.base.common.util.StringUtil;
 import com.simuwang.base.mapper.CompanyEmailConfigMapper;
 import com.simuwang.base.pojo.dos.CompanyEmailConfigDO;
 import com.simuwang.base.pojo.vo.CompanyEmailConfigVO;
@@ -33,6 +34,10 @@ public class CompanyEmailConfigServiceImpl implements CompanyEmailConfigService
                 emailConfigDO.setOpenStatus(emailConfigVO.getOpenStatus());
                 emailConfigDO.setIsvalid(1);
                 emailConfigDO.setUpdateTime(new Date());
+                CompanyEmailConfigDO oldEmailConfigDO = companyEmailConfigMapper.selectEmailConfig(emailConfigVO.getCompanyId(),emailConfigVO.getEmail());
+                if(!StringUtil.isNull(oldEmailConfigDO)){
+                    emailConfigVO.setId(oldEmailConfigDO.getId());
+                }
                 if(emailConfigVO.getId() != null){
                     emailConfigDO.setId(emailConfigVO.getId());
                     companyEmailConfigMapper.updateCompanyEmailConfig(emailConfigDO);

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

@@ -68,6 +68,9 @@ 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);
     }