修复

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

@@ -95,6 +95,7 @@ public class ApiEmailContactImportServiceImpl implements ApiEmailContactImportSe
         //校验邮件联系人导入信息是否存在
         //校验邮件联系人导入信息是否存在
         Result<EmailContactImport> result = checkEmailContactImportIsExist(request.getImportBizId());
         Result<EmailContactImport> result = checkEmailContactImportIsExist(request.getImportBizId());
         EmailContactImport emailContactImport = result.getData();
         EmailContactImport emailContactImport = result.getData();
+        Long id = emailContactImport.getId();
         //校验当前会话id下的收件人邮箱是否唯一
         //校验当前会话id下的收件人邮箱是否唯一
         List<EmailContactImport> list = iEmailContactImportService.queryList(EmailContactImportDto.builder()
         List<EmailContactImport> list = iEmailContactImportService.queryList(EmailContactImportDto.builder()
                 .sessionId(emailContactImport.getSessionId())
                 .sessionId(emailContactImport.getSessionId())
@@ -108,7 +109,7 @@ public class ApiEmailContactImportServiceImpl implements ApiEmailContactImportSe
             //判断入参收件人邮箱和库里收件人邮箱是否一致，如果不一致说明修改过，清空收件人唯一业务ID字段
             //判断入参收件人邮箱和库里收件人邮箱是否一致，如果不一致说明修改过，清空收件人唯一业务ID字段
             emailContactImport.setContactBizId("");
             emailContactImport.setContactBizId("");
         }
         }
-
+        emailContactImport.setId(id);
         emailContactImport.setReceiveEmail(request.getReceiveEmail());
         emailContactImport.setReceiveEmail(request.getReceiveEmail());
         emailContactImport.setCcEmail(!CollectionUtils.isEmpty(request.getCcEmailList()) ? String.join(";",request.getCcEmailList()) : "");
         emailContactImport.setCcEmail(!CollectionUtils.isEmpty(request.getCcEmailList()) ? String.join(";",request.getCcEmailList()) : "");
         iEmailContactImportService.saveOrUpdate(emailContactImport);
         iEmailContactImportService.saveOrUpdate(emailContactImport);

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

@@ -90,6 +90,7 @@ public class ApiEmailContactServiceImpl implements ApiEmailContactService {
         //校验邮箱联系人是否存在
         //校验邮箱联系人是否存在
         Result<EmailContact> result = checkEmailContactIsExist(request.getContactBizId());
         Result<EmailContact> result = checkEmailContactIsExist(request.getContactBizId());
         EmailContact emailContact = result.getData();
         EmailContact emailContact = result.getData();
+        Long id = emailContact.getId();
         //校验联系人邮箱唯一性
         //校验联系人邮箱唯一性
         List<EmailContact> list = iEmailContactService.queryList(EmailContactDto.builder()
         List<EmailContact> list = iEmailContactService.queryList(EmailContactDto.builder()
                 .email(request.getEmail())
                 .email(request.getEmail())
@@ -100,6 +101,7 @@ public class ApiEmailContactServiceImpl implements ApiEmailContactService {
         }
         }
 
 
         BeanUtils.copyProperties(request,emailContact);
         BeanUtils.copyProperties(request,emailContact);
+        emailContact.setId(id);
         iEmailContactService.saveOrUpdate(emailContact);
         iEmailContactService.saveOrUpdate(emailContact);
 
 
         //保存关联抄送邮箱的列表
         //保存关联抄送邮箱的列表

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

@@ -85,6 +85,7 @@ public class ApiEmailProviderConfigServiceImpl implements ApiEmailProviderConfig
         //校验邮箱服务商是否存在
         //校验邮箱服务商是否存在
         Result<EmailProviderConfig> result = checkEmailProviderConfigIsExist(request.getProviderBizId());
         Result<EmailProviderConfig> result = checkEmailProviderConfigIsExist(request.getProviderBizId());
         EmailProviderConfig emailProviderConfig = result.getData();
         EmailProviderConfig emailProviderConfig = result.getData();
+        Long id = emailProviderConfig.getId();
         //校验邮箱服务商名称唯一性
         //校验邮箱服务商名称唯一性
         List<EmailProviderConfig> list = iEmailProviderConfigService.queryList(EmailProviderConfigDto.builder()
         List<EmailProviderConfig> list = iEmailProviderConfigService.queryList(EmailProviderConfigDto.builder()
                 .providerName(request.getProviderName())
                 .providerName(request.getProviderName())
@@ -103,6 +104,7 @@ public class ApiEmailProviderConfigServiceImpl implements ApiEmailProviderConfig
         }
         }
 
 
         BeanUtils.copyProperties(request,emailProviderConfig);
         BeanUtils.copyProperties(request,emailProviderConfig);
+        emailProviderConfig.setId(id);
         iEmailProviderConfigService.saveOrUpdate(emailProviderConfig);
         iEmailProviderConfigService.saveOrUpdate(emailProviderConfig);
         return Result.success();
         return Result.success();
     }
     }

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

@@ -87,6 +87,7 @@ public class ApiEmailSenderConfigServiceImpl implements ApiEmailSenderConfigServ
         //校验邮件发件人是否存在
         //校验邮件发件人是否存在
         Result<EmailSenderConfig> result = checkEmailSenderConfigIsExist(request.getSenderBizId());
         Result<EmailSenderConfig> result = checkEmailSenderConfigIsExist(request.getSenderBizId());
         EmailSenderConfig emailSenderConfig = result.getData();
         EmailSenderConfig emailSenderConfig = result.getData();
+        Long id = emailSenderConfig.getId();
         //校验邮箱服务商是否存在
         //校验邮箱服务商是否存在
         apiEmailProviderConfigService.checkEmailProviderConfigIsExist(request.getProviderBizId());
         apiEmailProviderConfigService.checkEmailProviderConfigIsExist(request.getProviderBizId());
         //校验邮箱名称唯一性
         //校验邮箱名称唯一性
@@ -99,6 +100,7 @@ public class ApiEmailSenderConfigServiceImpl implements ApiEmailSenderConfigServ
         }
         }
 
 
         BeanUtils.copyProperties(request,emailSenderConfig);
         BeanUtils.copyProperties(request,emailSenderConfig);
+        emailSenderConfig.setId(id);
         //邮箱密码或授权码加密存入 TODO
         //邮箱密码或授权码加密存入 TODO
         iEmailSenderConfigService.saveOrUpdate(emailSenderConfig);
         iEmailSenderConfigService.saveOrUpdate(emailSenderConfig);
         return Result.success();
         return Result.success();

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

@@ -86,6 +86,7 @@ public class ApiEmailVariableGroupServiceImpl implements ApiEmailVariableGroupSe
         //校验变量分组是否存在
         //校验变量分组是否存在
         Result<EmailVariableGroup> result = checkEmailVariableGroupIsExist(request.getVariableGroupBizId());
         Result<EmailVariableGroup> result = checkEmailVariableGroupIsExist(request.getVariableGroupBizId());
         EmailVariableGroup emailVariableGroup = result.getData();
         EmailVariableGroup emailVariableGroup = result.getData();
+        Long id = emailVariableGroup.getId();
         //校验变量分组名称的唯一性
         //校验变量分组名称的唯一性
         List<EmailVariableGroup> list = iEmailVariableGroupService.queryList(EmailVariableGroupDto.builder()
         List<EmailVariableGroup> list = iEmailVariableGroupService.queryList(EmailVariableGroupDto.builder()
                 .groupName(request.getGroupName())
                 .groupName(request.getGroupName())
@@ -95,6 +96,7 @@ public class ApiEmailVariableGroupServiceImpl implements ApiEmailVariableGroupSe
             throw new BusinessException("变量分组名称已存在！");
             throw new BusinessException("变量分组名称已存在！");
         }
         }
         BeanUtils.copyProperties(request,emailVariableGroup);
         BeanUtils.copyProperties(request,emailVariableGroup);
+        emailVariableGroup.setId(id);
         iEmailVariableGroupService.saveOrUpdate(emailVariableGroup);
         iEmailVariableGroupService.saveOrUpdate(emailVariableGroup);
 
 
         //保存绑定的变量集合关系
         //保存绑定的变量集合关系

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

@@ -85,6 +85,7 @@ public class ApiEmailVariableServiceImpl implements ApiEmailVariableService {
         //校验变量信息是否存在
         //校验变量信息是否存在
         Result<EmailVariable> result = checkEmailVariableIsExist(request.getVariableBizId());
         Result<EmailVariable> result = checkEmailVariableIsExist(request.getVariableBizId());
         EmailVariable emailVariable = result.getData();
         EmailVariable emailVariable = result.getData();
+        Long id = emailVariable.getId();
         //校验变量字段名称中文名的唯一性
         //校验变量字段名称中文名的唯一性
         List<EmailVariable> list = iEmailVariableService.queryList(EmailVariableDto.builder()
         List<EmailVariable> list = iEmailVariableService.queryList(EmailVariableDto.builder()
                 .variableNameCn(request.getVariableNameCn())
                 .variableNameCn(request.getVariableNameCn())
@@ -103,6 +104,7 @@ public class ApiEmailVariableServiceImpl implements ApiEmailVariableService {
         }
         }
 
 
         BeanUtils.copyProperties(request,emailVariable);
         BeanUtils.copyProperties(request,emailVariable);
+        emailVariable.setId(id);
         iEmailVariableService.saveOrUpdate(emailVariable);
         iEmailVariableService.saveOrUpdate(emailVariable);
         return Result.success();
         return Result.success();
     }
     }

yd-email-feign/src/main/java/com/yd/email/feign/request/ApiEmailContactEditRequest.java

@@ -9,11 +9,11 @@ import java.util.List;
 @Data
 @Data
 public class ApiEmailContactEditRequest {
 public class ApiEmailContactEditRequest {
 
 
-    /**
-     * 联系人表主键ID
-     */
-    @NotNull(message = "联系人表主键ID不能为空")
-    private Long id;
+//    /**
+//     * 联系人表主键ID
+//     */
+//    @NotNull(message = "联系人表主键ID不能为空")
+//    private Long id;
 
 
     /**
     /**
      * 收件人唯一业务ID（联系人唯一业务ID）
      * 收件人唯一业务ID（联系人唯一业务ID）

yd-email-feign/src/main/java/com/yd/email/feign/request/ApiEmailContactImportEditRequest.java

@@ -3,17 +3,16 @@ package com.yd.email.feign.request;
 import lombok.Data;
 import lombok.Data;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 import java.util.List;
 import java.util.List;
 
 
 @Data
 @Data
 public class ApiEmailContactImportEditRequest {
 public class ApiEmailContactImportEditRequest {
 
 
-    /**
-     * 导入临时表主键ID
-     */
-    @NotNull(message = "导入临时表主键ID不能为空")
-    private Long id;
+//    /**
+//     * 导入临时表主键ID
+//     */
+//    @NotNull(message = "导入临时表主键ID不能为空")
+//    private Long id;
 
 
     /**
     /**
      * 导入临时表唯一业务ID
      * 导入临时表唯一业务ID

yd-email-feign/src/main/java/com/yd/email/feign/request/ApiEmailProviderConfigEditRequest.java

@@ -8,11 +8,11 @@ import javax.validation.constraints.NotNull;
 @Data
 @Data
 public class ApiEmailProviderConfigEditRequest {
 public class ApiEmailProviderConfigEditRequest {
 
 
-    /**
-     * 邮箱服务商主键ID
-     */
-    @NotNull(message = "邮箱服务商主键ID不能为空")
-    private Long id;
+//    /**
+//     * 邮箱服务商主键ID
+//     */
+//    @NotNull(message = "邮箱服务商主键ID不能为空")
+//    private Long id;
 
 
     /**
     /**
      * 邮箱服务商唯一业务ID
      * 邮箱服务商唯一业务ID

yd-email-feign/src/main/java/com/yd/email/feign/request/ApiEmailSenderConfigEditRequest.java

@@ -12,11 +12,11 @@ import javax.validation.constraints.NotNull;
 @Data
 @Data
 public class ApiEmailSenderConfigEditRequest {
 public class ApiEmailSenderConfigEditRequest {
 
 
-    /**
-     * 发件人表主键ID
-     */
-    @NotNull(message = "发件人表主键ID不能为空")
-    private Long id;
+//    /**
+//     * 发件人表主键ID
+//     */
+//    @NotNull(message = "发件人表主键ID不能为空")
+//    private Long id;
 
 
     /**
     /**
      * 发件人唯一业务ID
      * 发件人唯一业务ID

yd-email-feign/src/main/java/com/yd/email/feign/request/ApiEmailVariableEditRequest.java

@@ -8,11 +8,11 @@ import javax.validation.constraints.NotNull;
 @Data
 @Data
 public class ApiEmailVariableEditRequest {
 public class ApiEmailVariableEditRequest {
 
 
-    /**
-     * 变量表主键ID
-     */
-    @NotNull(message = "变量表主键ID不能为空")
-    private Long id;
+//    /**
+//     * 变量表主键ID
+//     */
+//    @NotNull(message = "变量表主键ID不能为空")
+//    private Long id;
 
 
     /**
     /**
      * 变量唯一业务ID
      * 变量唯一业务ID

yd-email-feign/src/main/java/com/yd/email/feign/request/ApiEmailVariableGroupEditRequest.java

@@ -9,11 +9,11 @@ import java.util.List;
 @Data
 @Data
 public class ApiEmailVariableGroupEditRequest {
 public class ApiEmailVariableGroupEditRequest {
 
 
-    /**
-     * 变量分组主键ID
-     */
-    @NotNull(message = "变量分组主键ID不能为空")
-    private Long id;
+//    /**
+//     * 变量分组主键ID
+//     */
+//    @NotNull(message = "变量分组主键ID不能为空")
+//    private Long id;
 
 
     /**
     /**
      * 变量分组唯一业务ID
      * 变量分组唯一业务ID