|
@@ -52,9 +52,10 @@ public class DispatchMessage {
|
|
|
MessageTemplate messageTemplate = messageTemplateMapper.selectById(messageTemplateId);
|
|
|
MessageType messageType = messageTypeMapper.selectById(messageTypeId);
|
|
|
MessageDto messageDto = new MessageDto();
|
|
|
- if(messageTemplate!=null){
|
|
|
+ String receiveMessageContent=receiveMessage.getMessageContent();
|
|
|
+ if(messageTemplate!=null&&receiveMessageContent.contains("{")){
|
|
|
String content = messageTemplate.getContent();
|
|
|
- Map<String,String> param = JSONObject.parseObject(receiveMessage.getMessageContent(), Map.class);
|
|
|
+ Map<String,String> param = JSONObject.parseObject(receiveMessageContent, Map.class);
|
|
|
String replaceContent = Parser.replaceAllClearBlanks(content, param);
|
|
|
receiveMessage.setMessageContent(replaceContent);
|
|
|
}
|