From 2ec2086b20602b1a36df6d0e60aa0792f2e6a381 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Fri, 15 Aug 2025 11:05:37 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=8F=96=E6=B6=88=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E6=80=BB=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Implements/DeviceTaskAssignmentService.cs  | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

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<Pagination<DeviceTaskAssignmentResponse>> GetPageAsync(DeviceTaskAssignmentRequest request)
     {
-        var page = await _dbContext.Queryable<DeviceTaskEntity>()
+        var rows = await _dbContext.Queryable<DeviceTaskEntity>()
             .LeftJoin<DeviceEntity>((deviceTask, device) => deviceTask.DeviceUniqueNo == device.UniqueNo)
             .LeftJoin<GainfoEntity>((deviceTask, device, ga) => deviceTask.UserNo == ga.No)
             .LeftJoin<GainfoLeaveEntity>((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<DeviceTaskAssignmentResponse>
+        {
+            PageIndex = request.PageIndex,
+            PageSize = request.PageSize,
+            Total = 0,
+            Data = rows
+        };
     }
 
     public async Task<Pagination<DeviceTaskAssignmentResponse>> GetPageWarningAsync(DeviceTaskAssignmentRequest request)