diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs index 20726c5a..1c6e495b 100644 --- a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs +++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs @@ -34,7 +34,7 @@ public class DeviceTaskAssignmentService : IDeviceTaskAssignmentService public async Task> GetPageAsync(DeviceTaskAssignmentRequest request) { - var page = await _dbContext.Queryable() + var rows = await _dbContext.Queryable() .LeftJoin((deviceTask, device) => deviceTask.DeviceUniqueNo == device.UniqueNo) .LeftJoin((deviceTask, device, ga) => deviceTask.UserNo == ga.No) .LeftJoin((deviceTask, device, ga, gaLeave) => deviceTask.UserNo == gaLeave.No) @@ -79,12 +79,12 @@ public class DeviceTaskAssignmentService : IDeviceTaskAssignmentService CreateBy = deviceTask.CreatedBy, Source = deviceTask.Source }) - .ToPageListAsync(request); + .ToPageListAsync(request.PageIndex, request.PageSize); try { var tenants = await _tenantApi.GetTenantsInternalAsync(); - page.Data.ForEach(item => { item.TenantName = tenants.FirstOrDefault(x => x.Code == item.TenantId)?.Name; }); + rows.ForEach(item => { item.TenantName = tenants.FirstOrDefault(x => x.Code == item.TenantId)?.Name; }); } catch (Exception) { @@ -93,16 +93,22 @@ public class DeviceTaskAssignmentService : IDeviceTaskAssignmentService try { - var userIds = page.Data.Select(x => x.CreateBy).Distinct().ToList(); + var userIds = rows.Select(x => x.CreateBy).Distinct().ToList(); var userInfos = await _userApi.GetUserByIdsAsync(new IdsRequest { Ids = userIds }); - page.Data.ForEach(item => item.Creator = userInfos.FirstOrDefault(x => x.Id == item.CreateBy)?.OperatorName); + rows.ForEach(item => item.Creator = userInfos.FirstOrDefault(x => x.Id == item.CreateBy)?.OperatorName); } catch (Exception e) { _logger.LogError("获取人员数据失败:{error}", e.Message); } - return page; + return new Pagination + { + PageIndex = request.PageIndex, + PageSize = request.PageSize, + Total = 0, + Data = rows + }; } public async Task> GetPageWarningAsync(DeviceTaskAssignmentRequest request)