fix 会议通知正文会影响发送短信
This commit is contained in:
@@ -42,9 +42,9 @@ public class SendMessageDTO implements Serializable {
|
|||||||
*/
|
*/
|
||||||
private String templateCode;
|
private String templateCode;
|
||||||
/**
|
/**
|
||||||
* 是否使用模板
|
* 会议通知正文
|
||||||
*/
|
*/
|
||||||
private Boolean useTemplate;
|
private String MeetingNotice;
|
||||||
/**
|
/**
|
||||||
* 模板参数
|
* 模板参数
|
||||||
*/
|
*/
|
||||||
|
|||||||
+2
-2
@@ -116,8 +116,8 @@ public class SendMessageServiceImpl implements SendMessageService {
|
|||||||
emailHandle.SendMsgAndFile(sendMessageDTO.getEmail(), title, content,sendMessageDTO.getListFile());
|
emailHandle.SendMsgAndFile(sendMessageDTO.getEmail(), title, content,sendMessageDTO.getListFile());
|
||||||
}else{
|
}else{
|
||||||
//如果有通知内容就替换
|
//如果有通知内容就替换
|
||||||
if (Objects.equals(sendMessageDTO.getUseTemplate(),false)){
|
if (StringUtils.isNotBlank(sendMessageDTO.getMeetingNotice())){
|
||||||
emailHandle.SendMsg(sendMessageDTO.getEmail(), title, map.get("value"));
|
emailHandle.SendMsg(sendMessageDTO.getEmail(), title, sendMessageDTO.getMeetingNotice());
|
||||||
}else {
|
}else {
|
||||||
emailHandle.SendMsg(sendMessageDTO.getEmail(), title, content);
|
emailHandle.SendMsg(sendMessageDTO.getEmail(), title, content);
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-2
@@ -465,8 +465,7 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
|
|||||||
SendMessageDTO sendMessageDTO = new SendMessageDTO();
|
SendMessageDTO sendMessageDTO = new SendMessageDTO();
|
||||||
HashMap<String, String> map = new HashMap<>();
|
HashMap<String, String> map = new HashMap<>();
|
||||||
if (StringUtils.isNotBlank(payMeeting.getNotice())){
|
if (StringUtils.isNotBlank(payMeeting.getNotice())){
|
||||||
sendMessageDTO.setUseTemplate(false);
|
sendMessageDTO.setMeetingNotice(payMeeting.getNotice());
|
||||||
map.put("value",payMeeting.getNotice());
|
|
||||||
}
|
}
|
||||||
map.put("meetingName",payMeeting.getMeetingName());
|
map.put("meetingName",payMeeting.getMeetingName());
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user