From d18992bf90e39e817a32381b4bd5b5ff3685a9e2 Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 21 Jul 2023 11:14:36 +0800 Subject: [PATCH] //..notice --- .../iformall/service/msg/impl/SendEmailServiceImpl.java | 7 +++++-- .../com/iformall/service/msg/impl/SendSmsServiceImpl.java | 6 ++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java index cde6d4718..3bc02c4e2 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendEmailServiceImpl.java @@ -60,9 +60,12 @@ public class SendEmailServiceImpl implements MsgSendService { WxMsgValidationcodeModel wxMsgModel = modelList.get(0); String msg = wxMsgModel.getContent(); - for (Map.Entry entry : mailMsg.getDynamicContentMap().entrySet()) { - msg = msg.replace("{"+entry.getKey()+"}", entry.getValue()); + if(mailMsg.getDynamicContentMap() != null){ + for (Map.Entry entry : mailMsg.getDynamicContentMap().entrySet()) { + msg = msg.replace("{"+entry.getKey()+"}", entry.getValue()); + } } + if(StringUtils.isNotBlank(wxMsgModel.getEmailBgImg())){ msg = msg.replace("{bg}", wxMsgModel.getEmailBgImg()); } diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java index fca924460..c7dbdb341 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/SendSmsServiceImpl.java @@ -103,8 +103,10 @@ public class SendSmsServiceImpl implements MsgSendService { wxMsgValidationcode.setSignature(wxMsgValidationcodeModel.getSignature()); //替换短信内容 String msg = wxMsgValidationcodeModel.getContent(); - for (Map.Entry entry : record.getDynamicContentMap().entrySet()) { - msg = msg.replace("{"+entry.getKey()+"}", entry.getValue()); + if(record.getDynamicContentMap() != null){ + for (Map.Entry entry : record.getDynamicContentMap().entrySet()) { + msg = msg.replace("{"+entry.getKey()+"}", entry.getValue()); + } } wxMsgValidationcode.setMsg(msg);