src/Hotline/FlowEngine/Workflows/WorkflowDomainService.cs

@@ -253,19 +253,21 @@ namespace Hotline.FlowEngine.Workflows
             var currentStep = GetUnHandleStep(workflow.Steps, _sessionContext.RequiredOrgId, _sessionContext.RequiredUserId);
             if (currentStep.Status is not EWorkflowStepStatus.WaitForAccept) return;
 
-            if (currentStep.HandlerType is EHandlerType.AssignedOrg or EHandlerType.OrgLevel or EHandlerType.OrgType
-               || (currentStep.InstanceMode is EInstanceMode.Dynamic && !currentStep.DynamicShouldTerminal())//动态并且非结束节点
-                   || (currentStep.IsInCountersign() && !currentStep.IsCountersignEndStep)//会签并且非会签节点
-                   )
-            {
-                //orgId
-                if (currentStep.Handlers.All(d => d.Key != orgId)) return;
-            }
-            else
-            {
-                //userId
-                if (currentStep.Handlers.All(d => d.Key != userId)) return;
-            }
+            if (currentStep.Handlers.All(d => d.Key != orgId && d.Key != userId)) return;
+
+            //if (currentStep.HandlerType is EHandlerType.AssignedOrg or EHandlerType.OrgLevel or EHandlerType.OrgType
+            //   || (currentStep.InstanceMode is EInstanceMode.Dynamic && !currentStep.DynamicShouldTerminal())//动态并且非结束节点
+            //       || (currentStep.IsInCountersign() && !currentStep.IsCountersignEndStep)//会签并且非会签节点
+            //       )
+            //{
+            //    //orgId
+            //    if (currentStep.Handlers.All(d => d.Key != orgId)) return;
+            //}
+            //else
+            //{
+            //    //userId
+            //    if (currentStep.Handlers.All(d => d.Key != userId)) return;
+            //}
 
             //if (currentStep.HandlerType is EHandlerType.AssignedUser or EHandlerType.Role
             //&& !currentStep.IsInCountersign()

src/XF.Domain.Repository/XF.Domain.Repository.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>1.0.4</Version>
+    <Version>1.0.5</Version>
     <NoWarn>$(NoWarn);8618;</NoWarn>
   </PropertyGroup>
 

src/XF.Domain/XF.Domain.csproj

@@ -5,7 +5,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>1.0.8</Version>
+    <Version>1.0.9</Version>
     <Authors>xf</Authors>
   </PropertyGroup>