Просмотр исходного кода

Merge branch 'develop' of https://git.youlane.cn/server/formallProject into develop

release_toaliyun_real
hanxueda 7 лет назад
Родитель
Сommit
6454f6bf91
1 измененных файлов: 4 добавлений и 5 удалений
  1. +4
    -5
      mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java

+ 4
- 5
mallinkService/src/main/java/com/iformall/service/impl/WxFlowServiceImpl.java Просмотреть файл

@@ -678,9 +678,6 @@ public class WxFlowServiceImpl implements WxFlowService {


//发邮件 //发邮件
if(StringUtils.isNotBlank(email)){ if(StringUtils.isNotBlank(email)){
msgReplaceMap = new HashedMap();
msgReplaceMap.put("contract", (String)getVariableByKey(variables,"contractNumber"));
msgReplaceMap.put("page", Constant.adminPage);
MailMsg mailMsg = new MailMsg(); MailMsg mailMsg = new MailMsg();
mailMsg.setSubject("审批通知"); mailMsg.setSubject("审批通知");
mailMsg.setHtml(true); mailMsg.setHtml(true);
@@ -713,11 +710,13 @@ public class WxFlowServiceImpl implements WxFlowService {
mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); mqBaseProducer.sendMessage(wxMsgRecord, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode());


//发邮件 //发邮件
if(StringUtils.isNotBlank(email)) {
if(StringUtils.isNotBlank(email)){
MailMsg mailMsg = new MailMsg(); MailMsg mailMsg = new MailMsg();
mailMsg.setSubject("审批通过通知");
mailMsg.setHtml(true);
mailMsg.setMsgType(EnumMsgRecordType.EMAIL.getCode()); mailMsg.setMsgType(EnumMsgRecordType.EMAIL.getCode());
mailMsg.setModelId(EnumMailMsgModel.MAIL_PASS_NODIFY.getCode()); mailMsg.setModelId(EnumMailMsgModel.MAIL_PASS_NODIFY.getCode());
mailMsg.setReceiver(email);
mailMsg.setTo(new String[]{email});
mailMsg.setTenantId(tenantId); mailMsg.setTenantId(tenantId);
mailMsg.setDynamicContentMap(msgReplaceMap); mailMsg.setDynamicContentMap(msgReplaceMap);
mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode()); mqBaseProducer.sendMessage(mailMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode());


Загрузка…
Отмена
Сохранить