首页

src/Hotline.Api/Controllers/CommonPController.cs

@@ -122,16 +122,16 @@ namespace Hotline.Api.Controllers
             var exceedOrder = await _orderRepository.Queryable(false, false, false)
                 .Includes(o => o.Workflow, w => w.Steps)
                 .Where(o => SqlFunc.JsonListObjectAny(o.Workflow.HandlerOrgs, "Key", _sessionContext.RequiredOrgId))
-                .Where(x => x.ExpiredTime != null &&
-                            (((x.Status == EOrderStatus.Filed || x.Status == EOrderStatus.Published || x.Status == EOrderStatus.Visited) && x.FiledTime >= x.ExpiredTime) ||
-                             ((x.Status != EOrderStatus.Filed && x.Status != EOrderStatus.Published && x.Status != EOrderStatus.Visited) && DateTime.Now >= x.ExpiredTime.Value)))
+                .Where(o => o.ExpiredTime != null &&
+                            (((o.Status == EOrderStatus.Filed || o.Status == EOrderStatus.Published || o.Status == EOrderStatus.Visited) && o.FiledTime >= o.ExpiredTime) ||
+                             ((o.Status != EOrderStatus.Filed && o.Status != EOrderStatus.Published && o.Status != EOrderStatus.Visited) && DateTime.Now >= o.ExpiredTime.Value)))
 				.GroupBy(o => o.Id)
                 .Select(o => new
                 {
-                    exceedTasksOkNum = SqlFunc.AggregateSum(SqlFunc.IIF(o.Workflow.Steps.Any(s => s.Status == EWorkflowStepStatus.Handled), 1, 0)),
-                    exceedHandleNum = SqlFunc.AggregateSum(SqlFunc.IIF(o.Workflow.Steps.Any(s => s.Status != EWorkflowStepStatus.Handled), 1, 0)),
+                    exceedTasksOkNum = SqlFunc.AggregateSum(SqlFunc.IIF(o.Workflow.Steps.Any(s => s.Status == EWorkflowStepStatus.Handled && s.HandlerOrgId == _sessionContext.RequiredOrgId), 1, 0)),
+                    exceedHandleNum = SqlFunc.AggregateSum(SqlFunc.IIF(o.Workflow.Steps.Any(s => s.Status != EWorkflowStepStatus.Handled && s.HandlerOrgId == _sessionContext.RequiredOrgId), 1, 0)),
                 }).FirstAsync();
-            var exceedTasksOkNum = exceedOrder?.exceedTasksOkNum ?? 0;
+			var exceedTasksOkNum = exceedOrder?.exceedTasksOkNum ?? 0;
             var exceedHandleNum = exceedOrder?.exceedHandleNum ?? 0;
 			return new { TasksOkNum = tasksOkNum, TasksOkOrgNum = tasksOkOrgNum, HandleNum = handleNum, HandleOrgNum = handleOrgNum, ExceedTasksOkNum = exceedTasksOkNum, ExceedHandleNum = exceedHandleNum };
         }