diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/dto/SendMessageDTO.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/dto/SendMessageDTO.java index 178f2fda..9a07328d 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/dto/SendMessageDTO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/dto/SendMessageDTO.java @@ -1,5 +1,6 @@ package com.jero.common.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -53,4 +54,9 @@ public class SendMessageDTO implements Serializable { * 文件名集合(邮箱发送附件) */ private List listFile; + /** + * 是否发送邮件 + */ + @ApiModelProperty(value = "是否发送邮件") + private Integer sendEmailFlag; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java index 1e55f0c6..face320b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/SendMessageServiceImpl.java @@ -104,8 +104,9 @@ public class SendMessageServiceImpl implements SendMessageService { // 1短信 2邮件 3系统 // 发送邮件 true String fromUser = sendMessageDTO.getFromUser(); + Integer sendEmailFlag = sendMessageDTO.getSendEmailFlag(); LoginUser loginUser = sysBaseAPI.getUserByName(fromUser); - if(templateType.contains(ProjectCommon.MESSAGE_TYPE2)){ + if(templateType.contains(ProjectCommon.MESSAGE_TYPE2) && !CommonConstant.DEL_FLAG_0.equals(sendEmailFlag)){ if(StringUtils.isEmpty(sendMessageDTO.getEmail())){ throw new JeroBootException("邮件发送,邮箱地址不能为空!"); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java index c4b209de..757e99d8 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java @@ -724,6 +724,7 @@ public class PayMeetingServiceImpl extends ServiceImpl subitemIds; @ApiModelProperty(value = "项目类型1:工作组,2:分标委") private Integer projectType; + @ApiModelProperty(value = "是否发送邮件") + private Integer sendEmailFlag; }