From b6a5f7b22c1c5214f82a198867074b59f12a8794 Mon Sep 17 00:00:00 2001
From: sunliang <593170460@qq.com>
Date: Wed, 6 Mar 2024 15:06:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E4=BA=A4=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/BP.WF/HttpHandler/WF_MyView.cs |  2 +-
 .../BP.WF/HttpHandler/WF_WorkOpt.cs           |  3 +++
 CCFlow/Components/BP.WF/Template/PushMsg.cs   | 21 +++++++++++++++++--
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/CCFlow/Components/BP.WF/HttpHandler/WF_MyView.cs b/CCFlow/Components/BP.WF/HttpHandler/WF_MyView.cs
index 8570a7b8..807a39d8 100644
--- a/CCFlow/Components/BP.WF/HttpHandler/WF_MyView.cs
+++ b/CCFlow/Components/BP.WF/HttpHandler/WF_MyView.cs
@@ -277,7 +277,7 @@ namespace BP.WF.HttpHandler
                         DataTable dtt = DBAccess.RunSQLReturnTable(sql);
                         bool isCanShowUnSend = true;
                         foreach (DataRow item in dtt.Rows) {
-                            if (item["IsPass"].ToString() == "0") {
+                            if (item["IsPass"].ToString() == "1") {
                                 isCanShowUnSend = false;
                                 break;
                             }
diff --git a/CCFlow/Components/BP.WF/HttpHandler/WF_WorkOpt.cs b/CCFlow/Components/BP.WF/HttpHandler/WF_WorkOpt.cs
index 17d0fecf..c316a5ef 100644
--- a/CCFlow/Components/BP.WF/HttpHandler/WF_WorkOpt.cs
+++ b/CCFlow/Components/BP.WF/HttpHandler/WF_WorkOpt.cs
@@ -387,6 +387,7 @@ namespace BP.WF.HttpHandler
                 //在线WebOffice打开
                 if (func.PrintOpenModel == PrintOpenModel.WebOffice)
                     return "err@【/WF/WebOffice/PrintOffice.htm】该文件没有重构好,您可以找到旧版本解决，或者自己开发。";
+                //Thread.Sleep(3000);
                 return billUrl;
             }
             catch (Exception ex)
@@ -613,6 +614,7 @@ namespace BP.WF.HttpHandler
                 //在线WebOffice打开
                 if (func.PrintOpenModel == PrintOpenModel.WebOffice)
                     return "err@【/WF/WebOffice/PrintOffice.htm】该文件没有重构好,您可以找到旧版本解决，或者自己开发。";
+                //Thread.Sleep(3000);
                 return billUrl;
             }
             catch (Exception ex)
@@ -850,6 +852,7 @@ namespace BP.WF.HttpHandler
                 //在线WebOffice打开
                 if (func.PrintOpenModel == PrintOpenModel.WebOffice)
                     return "err@【/WF/WebOffice/PrintOffice.htm】该文件没有重构好,您可以找到旧版本解决，或者自己开发。";
+                //Thread.Sleep(3000);
                 return billUrl;
             }
             catch (Exception ex)
diff --git a/CCFlow/Components/BP.WF/Template/PushMsg.cs b/CCFlow/Components/BP.WF/Template/PushMsg.cs
index 3a9294ba..d793c867 100644
--- a/CCFlow/Components/BP.WF/Template/PushMsg.cs
+++ b/CCFlow/Components/BP.WF/Template/PushMsg.cs
@@ -204,11 +204,25 @@ namespace BP.WF.Template
         {
             get
             {
-                return this.GetValIntByKey(PushMsgAttr.FK_Node);
+                return this.GetValIntByKey(PushMsgAttr.NodeID);
             }
             set
             {
-                this.SetValByKey(PushMsgAttr.FK_Node, value);
+                this.SetValByKey(PushMsgAttr.NodeID, value);
+            }
+        }
+        /// <summary>
+        ///节点
+        /// </summary>
+        public string EventNo
+        {
+            get
+            {
+                return this.GetValStringByKey(PushMsgAttr.EventNo);
+            }
+            set
+            {
+                this.SetValByKey(PushMsgAttr.EventNo, value);
             }
         }
         public string PushDoc
@@ -699,7 +713,10 @@ namespace BP.WF.Template
 
                 map.AddTBString(PushMsgAttr.FK_Flow, null, "流程", true, false, 0, 5, 10);
                 map.AddTBInt(PushMsgAttr.FK_Node, 0, "节点", true, false);
+                map.AddTBInt(PushMsgAttr.NodeID, 0, "节点", true, false);
                 map.AddTBString(PushMsgAttr.FK_Event, null, "事件类型", true, false, 0, 20, 10);
+                map.AddTBString(PushMsgAttr.EventNo, null, "事件类型", true, false, 0, 20, 10);
+
 
                 #region 将要删除.
                 map.AddDDLSysEnum(PushMsgAttr.PushWay, 0, "推送方式", true, false, PushMsgAttr.PushWay,