push

yd-email-api/src/main/java/com/yd/email/api/handler/EmailSendJobHandler.java

@@ -113,15 +113,15 @@ public class EmailSendJobHandler {
                     //抄送人邮箱列表
                     apiSendMailDto.setCcEmailList(ccEmailList);
                     //邮件内容
-                    if (StringUtil.hasPlaceholdersSimple(apiSendMailDto.getContent())) {
+                    if (StringUtil.hasPlaceholdersSimple(emailTask.getContent())
+                            && StringUtils.isNotBlank(emailTask.getVariableGroupBizId())) {
                         //检测内容是否有占位符，有占位符并且变量分组唯一业务ID不为空就替换具体内容,替换具体内容：recipient.getVariables()
-                        apiSendMailDto.setContent(StringUtil.replacePlaceholders(apiSendMailDto.getContent(),
+                        apiSendMailDto.setContent(StringUtil.replacePlaceholders(emailTask.getContent(),
                                 recipient.getVariables()));
                     }else if (StringUtil.hasPlaceholdersSimple(emailTask.getContent())
                             && StringUtils.isBlank(emailTask.getVariableGroupBizId())) {
                         //检测内容是否有占位符，有占位符并且变量分组唯一业务ID为空就替换具体内容。替换具体内容：通用变量字段：收件人姓名、收件人称谓、公司，这三个字段内容从收件人联系人获取
                         apiSendMailDto.setContent(apiEmailContactService.replacePlaceholders(emailTask.getContent(),recipient.getContactBizId()));
-
                     }
                     // 调用邮件服务发送邮件
                     apiEmailService.sendMail(apiSendMailDto);