From 1506716a2b0ab262252e8c23f9e2987c3af40e76 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Tue, 26 Nov 2024 17:07:11 +0800 Subject: [PATCH] =?UTF-8?q?refactor=20=E4=B8=8D=E5=8F=96count?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/Implements/AssignmentService.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs index d258885b..71a7bcd9 100644 --- a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs +++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs @@ -245,7 +245,7 @@ public class AssignmentService : IAssignmentService var data = await CommonHelper.RetryAsync(async () => { - var page = await _dbContext.Queryable() + var rows = await _dbContext.Queryable() .LeftJoin((deviceTask, device) => deviceTask.DeviceUniqueNo == device.UniqueNo) .LeftJoin((deviceTask, device, deviceTemplate) => deviceTemplate.Code == device.TemplateCode) .LeftJoin((deviceTask, device, deviceTemplate, ga) => deviceTask.UserNo == ga.No) @@ -294,14 +294,14 @@ public class AssignmentService : IAssignmentService : SqlFunc.ToInt32(ga.CardType) : 1 }) - .ToPageListAsync(request); + .ToPageListAsync(request.PageIndex, request.PageSize); - if (!page.Data.Any()) + if (!rows.Any()) { - return page.Data; + return rows; } - var taskIdVs = page.Data.Select(x => new { x.TaskId, x.Version, x.Status }).ToList(); + var taskIdVs = rows.Select(x => new { x.TaskId, x.Version, x.Status }).ToList(); var where = LinqExpressionExtensions.False(); taskIdVs.ForEach(p => { where = where.Or(x => x.Id == p.TaskId && x.Version == p.Version && x.Status == p.Status); }); @@ -317,7 +317,7 @@ public class AssignmentService : IAssignmentService throw new VersionExceptions("version exceptions"); } - return page.Data; + return rows; }, 5); return data;