Merge branch 'feature-消息中心' into 'master'

Feature 消息中心

See merge request !1274

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/notify/out/NoticeMessageApiServiceImpl.java

@@ -184,10 +184,17 @@ public class NoticeMessageApiServiceImpl implements NoticeMessageApiService {
 
         try {
 
-            Map<String, String> variableMap = messageQDTO.getContentMap();
+            Map<String, String> variableMap = ObjectUtil.isNotNull(messageQDTO.getContentMap()) ? messageQDTO.getContentMap() : new HashMap<>();
+
+            if (ObjectUtil.isNotEmpty(messageQDTO.getExtendContent())) {
+                variableMap.put("pageParams", JSONObject.toJSONString(messageQDTO.getExtendContent()));
+            }
+
+            if (ObjectUtil.isNotEmpty(messageQDTO.getTitle())) {
+                variableMap.put("templateTitle", messageQDTO.getTitle());
+            }
+
 
-            variableMap.put("pageParams", JSONObject.toJSONString(messageQDTO.getExtendContent()));
-            variableMap.put("templateTitle", messageQDTO.getTitle());
             NoticeMessageTypeEnum noticeMessageTypeEnum = NoticeMessageTypeEnum.getByType(messageQDTO.getMessageType());
             if (ObjectUtil.isNull(noticeMessageTypeEnum)) {
                 return;