diff --git a/B3WeChat/BO/NamedValueTemplate.cs b/B3WeChat/BO/NamedValueTemplate.cs
index 144992c..27e0f31 100644
--- a/B3WeChat/BO/NamedValueTemplate.cs
+++ b/B3WeChat/BO/NamedValueTemplate.cs
@@ -9,11 +9,11 @@ namespace BWP.B3WeChat.BO.NamedValueTemplate
public sealed class 审批状态
{
public static NamedValue<审批状态> 待审批 = new NamedValue<审批状态>(0);
- public static NamedValue<审批状态> 已审批 = new NamedValue<审批状态>(10);
- public static NamedValue<审批状态> 已退回 = new NamedValue<审批状态>(20);
+ public static NamedValue<审批状态> 已审批 = new NamedValue<审批状态>(1);
+ public static NamedValue<审批状态> 已退回 = new NamedValue<审批状态>(2);
///
/// 审批消息本身没有已删除状态,只用来查询消息状态用
///
- public static NamedValue<审批状态> 已删除 = new NamedValue<审批状态>(30);
+ public static NamedValue<审批状态> 已删除 = new NamedValue<审批状态>(3);
}
}
diff --git a/B3WeChat/Rpcs/ApproveMessageRpc.cs b/B3WeChat/Rpcs/ApproveMessageRpc.cs
index 4ece55e..957b7c1 100644
--- a/B3WeChat/Rpcs/ApproveMessageRpc.cs
+++ b/B3WeChat/Rpcs/ApproveMessageRpc.cs
@@ -11,6 +11,7 @@ using Forks.EnterpriseServices.SqlDoms;
using Forks.Utils;
using System;
using System.Collections.Generic;
+using System.IO;
using System.Linq;
using System.Text;
using System.Web;
@@ -53,13 +54,18 @@ namespace BWP.B3WeChat.Rpcs
var mainSystemConfig = new MainSystemConfig();
var internetAccessAddress = mainSystemConfig.InternetAccessAddress.Value;
- var originUrl = internetAccessAddress + "app/index.html";
+ var originUrl = internetAccessAddress + "app/index.html?messageid=" + message.ID;
var authUrl = internetAccessAddress + "WeChatLogin.aspx?url=" + HttpUtility.UrlEncode(originUrl);
var wechatUrl = WeChatPageUtil.GetWeChatUrl(authUrl);
- SendMessageUtil.SendInformInfo(message.OpenID, message.Title, DateTime.Now.ToShortTimeString(), message.Content, message.Username, BLContext.ClientIP, DateTime.Now.ToShortTimeString(), "", wechatUrl);
+
+ var wechatmessage = string.Format("ERP系统给你的用户{0}发送了一个消息待您审批", message.Username);
+
+ var timeStr = DateTime.Now.ToLongTimeString();
+
+ SendMessageUtil.SendInformInfo(message.OpenID, wechatmessage, timeStr, message.Title, message.Username, BLContext.ClientIP, timeStr, "", wechatUrl);
}
diff --git a/WebFolder/config/NamedValue/B3WeChat.xml b/WebFolder/config/NamedValue/B3WeChat.xml
index 464cc4b..05e28a9 100644
--- a/WebFolder/config/NamedValue/B3WeChat.xml
+++ b/WebFolder/config/NamedValue/B3WeChat.xml
@@ -2,9 +2,9 @@
-
-
-
+
+
+