Merge branch 'developer' into feature-daiban-12-14

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

@@ -27,6 +27,7 @@ import com.gic.wechat.api.dto.qywx.ItemDTO;
 import com.gic.wechat.api.dto.qywx.QywxXcxSendMessageDTO;
 import com.gic.wechat.api.service.qywx.QywxSuiteApiService;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -189,10 +190,17 @@ public class NoticeMessageApiServiceImpl implements NoticeMessageApiService {
             logger.info("不存在模板");
             return null;
         }
+
+
         //需要替换的数据
         Map<String, String> contentMap = messageQDTO.getContentMap();
+        if (MapUtils.isEmpty(contentMap)) {
+            return templateMessage;
+        }
+
         //替换的内容
         for (TemplateContentBO templateContentBO : templateMessage) {
+
             contentMap.forEach((k, v) -> {
                 templateContentBO.setVal(templateContentBO.getVal().replaceAll("\\#\\{" + k + "\\}", v));
             });