From c0a65e9be48402f74cde706fb927f9a22cd91b80 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 15 Apr 2019 19:35:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=AE=A1=E6=89=B9=E6=B5=81][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E5=AE=8C=E5=96=84=E8=B4=A6=E5=8D=95=E5=AE=A1?= =?UTF-8?q?=E6=89=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxFlowServiceImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index 58cb12d46..cd4a0da25 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -713,11 +713,14 @@ public class WxFlowServiceImpl implements WxFlowService { mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); //发邮件 - if(StringUtils.isNotBlank(email)) { + if(StringUtils.isNotBlank(email)){ + msgReplaceMap = new HashedMap(); MailMsg mailMsg = new MailMsg(); + mailMsg.setSubject("审批通过通知"); + mailMsg.setHtml(true); mailMsg.setMsgType(EnumMsgRecordType.EMAIL.getCode()); mailMsg.setModelId(EnumMailMsgModel.MAIL_PASS_NODIFY.getCode()); - mailMsg.setReceiver(email); + mailMsg.setTo(new String[]{email}); mailMsg.setTenantId(tenantId); mailMsg.setDynamicContentMap(msgReplaceMap); mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); From 601ccefa4487c8c14f76a6d8d405f02330b2e9e5 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 15 Apr 2019 19:41:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=AE=A1=E6=89=B9=E6=B5=81][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9][=E5=AE=8C=E5=96=84=E8=B4=A6=E5=8D=95=E5=AE=A1?= =?UTF-8?q?=E6=89=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxFlowServiceImpl.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java index cd4a0da25..c7bf04b16 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java @@ -678,9 +678,6 @@ public class WxFlowServiceImpl implements WxFlowService { //发邮件 if(StringUtils.isNotBlank(email)){ - msgReplaceMap = new HashedMap(); - msgReplaceMap.put("contract", (String)getVariableByKey(variables,"contractNumber")); - msgReplaceMap.put("page", Constant.adminPage); MailMsg mailMsg = new MailMsg(); mailMsg.setSubject("审批通知"); mailMsg.setHtml(true); @@ -714,7 +711,6 @@ public class WxFlowServiceImpl implements WxFlowService { //发邮件 if(StringUtils.isNotBlank(email)){ - msgReplaceMap = new HashedMap(); MailMsg mailMsg = new MailMsg(); mailMsg.setSubject("审批通过通知"); mailMsg.setHtml(true);