Browse Source

fixed: 会签存在汇总节点时也可以结束会签

xf 1 year ago
parent
commit
14c495a714
1 changed files with 4 additions and 3 deletions
  1. 4 3
      src/Hotline/FlowEngine/Workflows/WorkflowDomainService.cs

+ 4 - 3
src/Hotline/FlowEngine/Workflows/WorkflowDomainService.cs

@@ -267,9 +267,10 @@ namespace Hotline.FlowEngine.Workflows
             var unCompletedCountersign = workflow.Countersigns.FirstOrDefault(d => !d.IsCompleted() && d.StarterId == userId);
             if (unCompletedCountersign is null) return (workflow, null, canPrevious);
 
-            var existCountersignEndStep = workflow.Steps.Exists(d =>
-                d.IsCountersignEndStep && d.CountersignStartStepId == unCompletedCountersign.StartStepId);
-            return (workflow, existCountersignEndStep ? null : unCompletedCountersign.Id, canPrevious);
+            //var existCountersignEndStep = workflow.Steps.Exists(d =>
+            //    d.IsCountersignEndStep && d.CountersignStartStepId == unCompletedCountersign.StartStepId);
+            //return (workflow, existCountersignEndStep ? null : unCompletedCountersign.Id, canPrevious);
+            return (workflow, unCompletedCountersign.Id, canPrevious);
         }
 
         /// <summary>