From b908b3aff60e9967154283deaf4b127d7fcda35a Mon Sep 17 00:00:00 2001 From: sunliang <593170460@qq.com> Date: Tue, 5 Mar 2024 11:09:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=92=A4=E9=94=80=E5=9C=A8?= =?UTF-8?q?=E5=8F=91=E9=80=81=E5=90=8E=E4=B9=9F=E8=83=BD=E6=92=A4=E9=94=80?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E8=A7=A3=E5=86=B3=E5=B7=A5=E8=89=BA?= =?UTF-8?q?=E5=8D=A1=E5=AE=A1=E6=89=B9=E5=9C=A8=E6=9C=80=E5=90=8E=E8=8A=82?= =?UTF-8?q?=E7=82=B9=E7=BB=93=E6=9D=9F=E6=B5=81=E7=A8=8B=E6=97=B6=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98=EF=BC=88=E5=9C=BA=E6=99=AF=EF=BC=9A?= =?UTF-8?q?=E5=9B=A0=E4=B8=BA=E4=B8=8D=E6=98=AF=E4=BB=8E=E5=B7=A5=E8=89=BA?= =?UTF-8?q?=E5=8D=A1=E5=88=9B=E5=BB=BA=E8=B7=B3=E8=BD=AC=E8=BF=87=E6=9D=A5?= =?UTF-8?q?=E7=9A=84=EF=BC=8C=E6=89=80=E4=BB=A5=E6=88=91=E4=BB=AC=E5=85=B3?= =?UTF-8?q?=E8=81=94=E4=B8=8D=E5=88=B0=E6=98=AF=E5=93=AA=E4=B8=AA=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E6=B5=81=E7=A8=8B=E5=AF=BC=E8=87=B4=E7=9A=84=E6=8A=A5?= =?UTF-8?q?=E9=94=99=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CCFlow/DataUser/API/Controllers/APIController.cs | 2 +- CCFlow/Components/BP.Demo/DoEvnFlow.cs | 11 +++++++++-- CCFlow/Components/BP.WF/HttpHandler/WF_MyView.cs | 12 +++++++++--- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/CCFlow/CCFlow/DataUser/API/Controllers/APIController.cs b/CCFlow/CCFlow/DataUser/API/Controllers/APIController.cs index b87b3e0e..7224ab3a 100644 --- a/CCFlow/CCFlow/DataUser/API/Controllers/APIController.cs +++ b/CCFlow/CCFlow/DataUser/API/Controllers/APIController.cs @@ -1779,7 +1779,7 @@ namespace CCFlow.DataUser.API.Controllers if (BP.Difference.SystemConfig.CCBPMRunModel == CCBPMRunModel.SAAS) wfSql = " AND a.OrgNo='" + WebUser.OrgNo + "'"; - ps.SQL = "SELECT count(b.WorkID) as Num FROM WF_Generworkflow a JOIN WF_GenerWorkerList b ON a.WorkID=b.WorkID WHERE b.FK_Emp=" + dbstr + "FK_Emp AND b.IsPass=0 AND a.WFState <> 0 " + wfSql; + ps.SQL = "SELECT count(b.WorkID) as Num FROM WF_Generworkflow a JOIN WF_GenerWorkerList b ON a.WorkID=b.WorkID WHERE b.FK_Emp=" + dbstr + "FK_Emp AND b.IsPass=0 AND a.WFState > 1 " + wfSql; ps.Add("FK_Emp", UserNo); int nums = DBAccess.RunSQLReturnValInt(ps); return Return_Info(200, "查询成功", "EmpWorksNums:" + nums); diff --git a/CCFlow/Components/BP.Demo/DoEvnFlow.cs b/CCFlow/Components/BP.Demo/DoEvnFlow.cs index 5f38dee8..7f457f9f 100644 --- a/CCFlow/Components/BP.Demo/DoEvnFlow.cs +++ b/CCFlow/Components/BP.Demo/DoEvnFlow.cs @@ -13,15 +13,22 @@ namespace BP.Demo public class DoEvnFlow : BP.WF.FlowEventBase { public override string FlowMark { - get {return "021,002"; } + get {return "021,002,060"; } } public override string FlowOverAfter() { try { GenerWorkFlow gwf = new GenerWorkFlow(this.WorkID); - string pTable1 = BP.DA.DBAccess.RunSQLReturnString("SELECT PTable FROM WF_FLOW WHERE No = " + gwf.FlowNo);//当前触发流程存储表 + string pTable1 = BP.DA.DBAccess.RunSQLReturnString("SELECT PTable FROM WF_FLOW WHERE No = " + gwf.FlowNo);//当前触发流程存储表 DataTable BFParas = BP.DA.DBAccess.RunSQLReturnTable("SELECT LCBH,BFOID,FLOWENDERRDT FROM " + pTable1 + " WHERE OID='" + this.WorkID + "'");//要同步表的数据 + if (BFParas.Rows[0][0].ToString() == "") { + return ""; + } + if (BFParas.Rows[0][1].ToString() == "") + { + return ""; + } string pTable2 = BP.DA.DBAccess.RunSQLReturnString("SELECT PTable FROM WF_FLOW WHERE No = " + BFParas.Rows[0][0]); if (gwf.FlowNo == "021") { diff --git a/CCFlow/Components/BP.WF/HttpHandler/WF_MyView.cs b/CCFlow/Components/BP.WF/HttpHandler/WF_MyView.cs index e0cc9cdb..8570a7b8 100644 --- a/CCFlow/Components/BP.WF/HttpHandler/WF_MyView.cs +++ b/CCFlow/Components/BP.WF/HttpHandler/WF_MyView.cs @@ -275,9 +275,15 @@ namespace BP.WF.HttpHandler //BKGY 撤销发送 sql = "SELECT WorkID,FK_Emp,FK_Node,IsPass From WF_GenerWorkerlist WHERE WorkID=" + this.WorkID +" And FK_Node='"+ gwf.NodeID+"'"; DataTable dtt = DBAccess.RunSQLReturnTable(sql); - - - if(nd.HisCancelRole == BP.WF.CancelRole.OnlyNextStep && dtt.Rows[0][3].ToString().Equals("0")) + bool isCanShowUnSend = true; + foreach (DataRow item in dtt.Rows) { + if (item["IsPass"].ToString() == "0") { + isCanShowUnSend = false; + break; + } + } + + if(nd.HisCancelRole == BP.WF.CancelRole.OnlyNextStep && isCanShowUnSend) if (dtt.Rows.Count > 0 || powers.Contains("FlowDataUnSend") == true) { dr = dt.NewRow();