From 2468bc9302eadafe069389f324ebd247dec071ff Mon Sep 17 00:00:00 2001
From: sunliang <593170460@qq.com>
Date: Tue, 16 Jul 2024 18:05:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=82=B9=E5=87=BB=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E9=99=84=E4=BB=B6=E7=9B=B4=E6=8E=A5=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CCFlow/Components/BP.WF/HttpHandler/WF_CCForm.cs | 2 +-
 CCFlow/Components/BP.WF/WF/WorkNode.cs           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CCFlow/Components/BP.WF/HttpHandler/WF_CCForm.cs b/CCFlow/Components/BP.WF/HttpHandler/WF_CCForm.cs
index fd48ed4c..c11b1c29 100644
--- a/CCFlow/Components/BP.WF/HttpHandler/WF_CCForm.cs
+++ b/CCFlow/Components/BP.WF/HttpHandler/WF_CCForm.cs
@@ -5707,7 +5707,7 @@ namespace BP.WF.HttpHandler
                 {
                     //表单类别区别打印@BKGY
                     MapData mp = new MapData(downDB.FrmID);
-                    string[] flowAttr = { "37f23552-7", "a25d959b-7", "b12f75b4-b" };
+                    string[] flowAttr = { "37f23552-7", "a25d959b-7", "b12f75b4-b", "1b19f983-6", "d81875ba-9", "749dae21-0", "713089ef-8", "713b4ca5-5", "b618e9ce-c" };
                     if (Array.IndexOf(flowAttr, mp.FormTreeNo) >= 0)
                     {
                         int splitStartIndex = filepath.IndexOf("DataUser/");
diff --git a/CCFlow/Components/BP.WF/WF/WorkNode.cs b/CCFlow/Components/BP.WF/WF/WorkNode.cs
index 54e0fe3c..9ec7adfc 100644
--- a/CCFlow/Components/BP.WF/WF/WorkNode.cs
+++ b/CCFlow/Components/BP.WF/WF/WorkNode.cs
@@ -5566,7 +5566,7 @@ namespace BP.WF
                 aths.Retrieve(AuthAttr.AutherToEmpNo, WebUser.No);
                 string whereSQL = " ";
                 string sql = " ";
-                string userNo = " ";
+                string userNo = "";
 
                 if (aths.Count !=0 ) {
 
@@ -5617,7 +5617,7 @@ namespace BP.WF
 
                 }
                 
-                if ((userNo == null && userNo == "" )&& (gwl.EmpNo.Equals(WebUser.No) == false))
+                if (DataType.IsNullOrEmpty(userNo) && (gwl.EmpNo.Equals(WebUser.No) == false))
                     continue;
 
                 //设置当前不可以用.