push

yd-email-api/src/main/java/com/yd/email/api/service/impl/ApiEmailContactServiceImpl.java

@@ -214,7 +214,7 @@ public class ApiEmailContactServiceImpl implements ApiEmailContactService {
             result = result
             result = result
                     .replace(GeneralVariableEnum.GENERAL_EMAIL.getItemValue(), email)
                     .replace(GeneralVariableEnum.GENERAL_EMAIL.getItemValue(), email)
                     .replace(GeneralVariableEnum.GENERAL_CC_EMAIL.getItemValue(), ccEmails)
                     .replace(GeneralVariableEnum.GENERAL_CC_EMAIL.getItemValue(), ccEmails)
-                    .replace(GeneralVariableEnum.GENERAL_CONTACT.getItemValue(), name)
+//                    .replace(GeneralVariableEnum.GENERAL_CONTACT.getItemValue(), name)
                     .replace(GeneralVariableEnum.GENERAL_APPELLATION.getItemValue(), appellation)
                     .replace(GeneralVariableEnum.GENERAL_APPELLATION.getItemValue(), appellation)
                     .replace(GeneralVariableEnum.GENERAL_COMPANTNAME.getItemValue(), companyName);
                     .replace(GeneralVariableEnum.GENERAL_COMPANTNAME.getItemValue(), companyName);
         }
         }

yd-email-api/src/main/java/com/yd/email/api/service/impl/ApiEmailFileServiceImpl.java

@@ -72,7 +72,7 @@ public class ApiEmailFileServiceImpl implements ApiEmailFileService {
 
 
     // 固定表头字段-通用变量
     // 固定表头字段-通用变量
     private static final Set<String> FIXED_HEADERS = new HashSet<>(Arrays.asList(
     private static final Set<String> FIXED_HEADERS = new HashSet<>(Arrays.asList(
-            GeneralVariableEnum.GENERAL_CONTACT.getItemLabel(),
+//            GeneralVariableEnum.GENERAL_CONTACT.getItemLabel(),
             GeneralVariableEnum.GENERAL_EMAIL.getItemLabel(),
             GeneralVariableEnum.GENERAL_EMAIL.getItemLabel(),
             GeneralVariableEnum.GENERAL_CC_EMAIL.getItemLabel(),
             GeneralVariableEnum.GENERAL_CC_EMAIL.getItemLabel(),
             GeneralVariableEnum.GENERAL_APPELLATION.getItemLabel(),
             GeneralVariableEnum.GENERAL_APPELLATION.getItemLabel(),
@@ -231,7 +231,8 @@ public class ApiEmailFileServiceImpl implements ApiEmailFileService {
             // 设置固定字段
             // 设置固定字段
             contactImport.setImportBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_EMAIL_CONTACT_IMPORT.getCode()));
             contactImport.setImportBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_EMAIL_CONTACT_IMPORT.getCode()));
             contactImport.setSessionId(sessionId);
             contactImport.setSessionId(sessionId);
-            contactImport.setReceiveName(getStringValue(row, GeneralVariableEnum.GENERAL_CONTACT.getItemLabel()));
+//            contactImport.setReceiveName(getStringValue(row, GeneralVariableEnum.GENERAL_CONTACT.getItemLabel()));
+            contactImport.setReceiveName(getStringValue(row, GeneralVariableEnum.GENERAL_APPELLATION.getItemLabel()));
             contactImport.setReceiveEmail(getStringValue(row, GeneralVariableEnum.GENERAL_EMAIL.getItemLabel()));
             contactImport.setReceiveEmail(getStringValue(row, GeneralVariableEnum.GENERAL_EMAIL.getItemLabel()));
             contactImport.setCcEmail(getStringValue(row, GeneralVariableEnum.GENERAL_CC_EMAIL.getItemLabel()));
             contactImport.setCcEmail(getStringValue(row, GeneralVariableEnum.GENERAL_CC_EMAIL.getItemLabel()));