Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/oa/service/impl/NewsServiceImpl.java

@@ -266,22 +266,22 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
                     for (User user : userList) {
                         WeChatSendMessageDto weChatSendMessageDto = new WeChatSendMessageDto();
                         weChatSendMessageDto.setUserId(user.getOpenId());
-                        weChatSendMessageDto.setTemplateId("sHsmz7LRj7HLd7GSTS3r2uKMhE2f1iDAW15RqSK_6KM");
+                        weChatSendMessageDto.setTemplateId("qmpXORPM1Cocqn503Qa4OkNNQ0uxlj2-ed9m6uWO-v4");
                         weChatSendMessageDto.setUrl("/pages/message/notice/detail?id=" + id);
                         weChatSendMessageDto.setMsgId(id.toString());
                         JSONObject data = new JSONObject();
 
                         JSONObject data1 = new JSONObject();
                         data1.put("value", news.getFullHead());
-                        data.put("thing2", data1);
+                        data.put("thing23", data1);
 
                         JSONObject data2 = new JSONObject();
                         data2.put("value", news.getAuthorName());
-                        data.put("phrase5", data2);
+                        data.put("thing18", data2);
 
                         JSONObject data3 = new JSONObject();
                         data3.put("value", LocalDateTimeUtil.format(news.getReleaseTime(), "yyyy-MM-dd HH:mm:ss"));
-                        data.put("time3", data3);
+                        data.put("time17", data3);
                         weChatSendMessageDto.setContent(data);
                         weChatService.sendTemplateMessage(weChatSendMessageDto);
                     }
@@ -305,15 +305,15 @@ public class NewsServiceImpl extends MPJBaseServiceImpl<NewsMapper, News> implem
 
                         JSONObject data1 = new JSONObject();
                         data1.put("value", news.getFullHead());
-                        data.put("thing2", data1);
+                        data.put("thing23", data1);
 
                         JSONObject data2 = new JSONObject();
                         data2.put("value", news.getAuthorName());
-                        data.put("phrase5", data2);
+                        data.put("thing18", data2);
 
                         JSONObject data3 = new JSONObject();
                         data3.put("value", LocalDateTimeUtil.format(news.getReleaseTime(), "yyyy-MM-dd HH:mm:ss"));
-                        data.put("time3", data3);
+                        data.put("time17", data3);
                         weChatSendMessageDto.setContent(data);
                         weChatService.sendTemplateMessage(weChatSendMessageDto);
                     }

src/main/java/com/xjrsoft/module/oa/utils/SendMessageUtil.java

@@ -96,7 +96,7 @@ public class SendMessageUtil {
                 }});
                 // 事项名称
                 data.put("thing2", new JSONObject() {{
-                    put("value", name);
+                    put("value", String.format("《%s》发起了《%s》,待审批!", param.getStartUserName(), param.getSchemaName()));
                 }});
                 // 申请人
                 data.put("thing6", new JSONObject() {{

src/main/java/com/xjrsoft/module/organization/service/impl/WeChatServiceImgl.java

@@ -2,6 +2,7 @@ package com.xjrsoft.module.organization.service.impl;
 
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.xjrsoft.common.enums.DeleteMark;
@@ -47,7 +48,10 @@ public class WeChatServiceImgl implements IWeChatService {
         JSONObject object = new JSONObject();
         object.put("touser", dto.getUserId());
         object.put("template_id", dto.getTemplateId());
-        object.put("url", dto.getUrl());
+        object.put("miniprogram", new JSONObject() {{
+            put("appid", weChatUtil.getAppletAppKey());
+            put("pagepath", dto.getUrl());
+        }});
         object.put("client_msg_id", dto.getMsgId());
         object.put("data", dto.getContent());
         weChatUtil.sendTemplateMessage(object);