Sfoglia il codice sorgente

fix: 查询特提待选对象,返回该节点原办理对象增加FlowStepHandler参数

xf 10 mesi fa
parent
commit
dfc24ad956

+ 4 - 3
src/Hotline.Application/FlowEngine/WorkflowApplication.cs

@@ -618,9 +618,10 @@ public class WorkflowApplication : IWorkflowApplication, IScopeDependency
             //需求已调整为特提必重算期满时间
 
             //需求:撤回选择办理对象时,默认选中该节点原办理对象
-            if (originStep.Handlers.Any())
-                stepOption.Handler =
-                    originStep.Handlers.FirstOrDefault(d => d.Key == originStep.HandlerId || d.Key == originStep.HandlerOrgId);
+            //if (originStep.Handlers.Any())
+            //    stepOption.Handler = originStep.Handlers.FirstOrDefault(d => d.Key == originStep.HandlerId || d.Key == originStep.HandlerOrgId);
+            stepOption.Handler = originStep.GetWorkflowStepHandler();
+
             //if (originStep.StepHandlers.Any())
             //    stepOption.Handler = originStep.GetActualHandler()?.GetHandler() ?? new();
 

+ 1 - 1
src/Hotline.Share/Dtos/FlowEngine/NextStepOption.cs

@@ -45,7 +45,7 @@ public class RecallStepOption : NextStepOption
     /// <summary>
     /// 该节点原办理对象
     /// </summary>
-    public Kv Handler { get; set; }
+    public FlowStepHandler Handler { get; set; }
 }
 
 /// <summary>

+ 0 - 13
src/Hotline.Share/Dtos/Order/NextStepsWithRecommendDto.cs → src/Hotline.Share/Dtos/Order/RecommendStepOption.cs

@@ -2,19 +2,6 @@
 
 namespace Hotline.Share.Dtos.Order;
 
-public class NextStepsWithRecommendDto : NextStepsDto
-{
-    /// <summary>
-    /// 推荐部门id
-    /// </summary>
-    public string RecommendOrgId { get; set; }
-
-    /// <summary>
-    /// 推荐部门名称
-    /// </summary>
-    public string RecommendOrgName { get; set; }
-}
-
 public class RecommendStepOption : NextStepOption
 {
     /// <summary>