Merge branch 'dev-xym-update-token' of Server/growth-manager into master

offline-module/src/main/java/com/tzld/piaoquan/offline/job/WeComSpecialDataJob.java

@@ -153,7 +153,6 @@ public class WeComSpecialDataJob {
                 } else {
                     specialSendMessage.setContent(content);
                 }
-                specialSendMessage.setContent(content);
                 specialSendMessage.setPreSendDate(date);
                 specialSendMessageMapper.insertSelective(specialSendMessage);
             }
@@ -173,9 +172,10 @@ public class WeComSpecialDataJob {
             specialSendMessage.setGroup(preId.intValue());
             specialSendMessage.setAttachmentIds(attachmentIds);
             if (content.contains("${name}")) {
-                content = content.replace("${name}", weComUser.getName());
+                specialSendMessage.setContent(content.replace("${name}", weComUser.getName()));
+            } else {
+                specialSendMessage.setContent(content);
             }
-            specialSendMessage.setContent(content);
             specialSendMessage.setPreSendDate(date);
             specialSendMessageMapper.insertSelective(specialSendMessage);
         }