diff --git a/OpenAuth.App/workflow/WorkflowEngineApp.cs b/OpenAuth.App/workflow/WorkflowEngineApp.cs index b944467..5e07d7d 100644 --- a/OpenAuth.App/workflow/WorkflowEngineApp.cs +++ b/OpenAuth.App/workflow/WorkflowEngineApp.cs @@ -97,7 +97,7 @@ public class WorkflowEngineApp : SqlSugarBaseApp() @@ -109,7 +109,7 @@ public class WorkflowEngineApp : SqlSugarBaseApp() .Where(a => a.InstanceId == instanceId @@ -127,7 +127,7 @@ public class WorkflowEngineApp : SqlSugarBaseApp Forwarded -> 转发之后 Auditing -> 审核之后 Summarized-> 汇总判断之后 Rejected // 驳回之后 Rejected -> 转发之后 Auditing -> 审核之后 Summarized 。。。 flowInstance.Status = GetFlowStatusByNodeType(nextNode.NodeType); - _sqlSugar.Updateable(flowInstance).IgnoreNullColumns().ExecuteCommand(); + _sqlSugar.Updateable(flowInstance).IgnoreColumns(ignoreAllNullColumns:true,ignoreAllDefaultValue:true).ExecuteCommand(); // 为选择的每个审核科创建工作项 if (nextNode.NodeType == "Parallel") { @@ -1287,7 +1287,7 @@ public class WorkflowEngineApp : SqlSugarBaseApp() .LeftJoin((w, a) - => w.InstanceId == a.InstanceId && w.HandlerId == a.AuditorId) + => w.InstanceId == a.InstanceId && w.HandlerId == a.AuditorId && w.NodeId == a.NodeId) .LeftJoin((w, a, n) => w.NodeId == n.NodeId) .Where(w => w.InstanceId == instance.InstanceId && w.Status == "Done") .OrderByDescending(w => w.WorkitemId) diff --git a/OpenAuth.WebApi/Controllers/ServerController/CustomWorkflowController.cs b/OpenAuth.WebApi/Controllers/ServerController/CustomWorkflowController.cs index 57d0113..0d059a4 100644 --- a/OpenAuth.WebApi/Controllers/ServerController/CustomWorkflowController.cs +++ b/OpenAuth.WebApi/Controllers/ServerController/CustomWorkflowController.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Mvc; using OpenAuth.App.Interface; using OpenAuth.App.workflow; @@ -264,6 +265,7 @@ public class WorkflowController : ControllerBase /// /// [HttpGet] + [AllowAnonymous] public ActionResult> Detail(string businessNo) { var detail = _workflowEngineApp.Detail(businessNo);