1

GxPress/Service/GxPress.Service.Implement/Flow/FlowService.Get.cs

@@ -84,8 +84,16 @@ namespace GxPress.Service.Implement
             query.Where(nameof(Entity.WorkFlow.FlowTodo.Id), todoId);
             //query.Where(nameof(Entity.WorkFlow.FlowTodo.UserId), userId);
             var flowTodeDto = await _flowTodoRepository.GetAsync(query);
+            var flowToDos = new List<Entity.WorkFlow.FlowTodo>();
             if (flowTodeDto != null)
+            {
                 flowId = flowTodeDto.FlowId;
+                query = Q.NewQuery();
+                query.Where(nameof(Entity.WorkFlow.FlowTodo.FlowId), flowId);
+                query.Where(nameof(Entity.WorkFlow.FlowTodo.IsOperate), true);
+                flowToDos.AddRange(await _flowTodoRepository.GetAllAsync(query));
+                flowTodeDto = flowToDos.FirstOrDefault(n => n.UserId == userId);
+            }
             else
                 flowId = todoId;
             var flowDto = await GetAsync(flowId);
@@ -232,7 +240,10 @@ namespace GxPress.Service.Implement
                         flowResult.State = FlowState.Denied;
                     else
                     {
-                        flowResult.State = FlowState.Checking;
+                        if (flowToDos != null && flowToDos.Any(n => n.UserId == userId))
+                        {
+                            flowResult.State = FlowState.Checking;
+                        }
                     }
                 }
                 else