|
@@ -602,12 +602,12 @@ namespace Hotline.FlowEngine.Workflows
|
|
|
var unhandlePreviousTrace = workflow.Traces.FirstOrDefault(d =>
|
|
|
d.Status is not EWorkflowStepStatus.Handled
|
|
|
);
|
|
|
-
|
|
|
+
|
|
|
var unCompletedCountersign = workflow.Countersigns
|
|
|
.FirstOrDefault(d => !d.IsCompleted() && d.StarterOrgId == orgId);
|
|
|
if (unCompletedCountersign is null)
|
|
|
return (workflow, null, canHandle, canPrevious, unhandlePreviousTrace);
|
|
|
-
|
|
|
+
|
|
|
//var existCountersignEndStep = workflow.Steps.Exists(d =>
|
|
|
// d.IsCountersignEndStep && d.CountersignStartStepId == unCompletedCountersign.StartStepId);
|
|
|
//return (workflow, existCountersignEndStep ? null : unCompletedCountersign.Id, canPrevious);
|
|
@@ -3385,7 +3385,8 @@ namespace Hotline.FlowEngine.Workflows
|
|
|
step.StepExpiredTime = expiredTime;
|
|
|
//step.TimeLimit = GetTimeLimit("");
|
|
|
step.IsOrigin = isOrigin;
|
|
|
- step.Name = stepName;
|
|
|
+ if (!string.IsNullOrEmpty(stepName))
|
|
|
+ step.Name = stepName;
|
|
|
|
|
|
//新增需求: 部门汇总节点由部门办理//todo 待确认中心由部门处理还是由之前办理人办理 待重构
|
|
|
if (step.StepType == EStepType.Summary && step.BusinessType == EBusinessType.Department)
|