甄别

src/Hotline.Api/Controllers/OrderController.cs

@@ -1224,10 +1224,15 @@ public class OrderController : BaseController
                              && SqlFunc.JsonListObjectAny(x.Workflow.HandlerUsers, "Key",
                                  _sessionContext.RequiredUserId));
         }
-
+        if (dto.Status.HasValue && dto.Status == EScreenStatus.MyHandle)
+        {
+			query.Where(x => (x.Status != EScreenStatus.Apply )
+			                 && SqlFunc.JsonListObjectAny(x.Workflow.HandlerUsers, "Key",
+				                 _sessionContext.RequiredUserId));
+		}
         var (total, items) = await query
-            .WhereIF(dto.Status.HasValue && dto.Status == EScreenStatus.MyHandle,
-                x => x.Status != EScreenStatus.Apply && x.CreatorId == _sessionContext.UserId)
+            //.WhereIF(dto.Status.HasValue && dto.Status == EScreenStatus.MyHandle,
+            //    x => x.Status != EScreenStatus.Apply && x.CreatorId == _sessionContext.UserId)
             .WhereIF(dto.CreationTimeStart.HasValue, d => d.CreationTime >= dto.CreationTimeStart)
             .WhereIF(dto.CreationTimeEnd.HasValue, d => d.CreationTime <= dto.CreationTimeEnd)
             .WhereIF(!string.IsNullOrEmpty(dto.OrderId), x => x.OrderId == dto.OrderId)
@@ -1274,7 +1279,8 @@ public class OrderController : BaseController
         var workflowId = string.Empty;
         try
         {
-            await _orderRepository.OrderScreenRevisionVisit(visit.Id, false, HttpContext.RequestAborted);
+            //二次回访会改写数据
+            //await _orderRepository.OrderScreenRevisionVisit(visit.Id, false, HttpContext.RequestAborted);
             var startDto = _mapper.Map<StartWorkflowDto>(dto.Workflow);
             startDto.DefinitionModuleCode = WorkflowModuleConsts.OrderScreen;
             startDto.Title = dto.Data.Content;