diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs
index fd92c962..20726c5a 100644
--- a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs
+++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs
@@ -44,7 +44,7 @@ public class DeviceTaskAssignmentService : IDeviceTaskAssignmentService
             )
             .WhereIF(request.UserNo.IsPresent(), deviceTask => deviceTask.UserNo == request.UserNo)
             .Where(deviceTask => deviceTask.TenantId == request.Factory)
-            .WhereIF(request.Type.HasValue, (deviceTask, device) => deviceTask.DeviceType == request.Type && device.Enable) //过滤未启用的设备任务
+            .WhereIF(request.Type.HasValue, (deviceTask, device) => deviceTask.DeviceType == request.Type)
             .WhereIF(request.TaskTypes.IsPresent(), deviceTask => request.TaskTypes.Contains(deviceTask.Type))
             .WhereIF(request.Status.IsPresent(), deviceTask => request.Status.Contains(deviceTask.Status))
             .WhereIF(!request.Search.IsEmpty(), (deviceTask, device, ga, gaLeave) =>
@@ -57,6 +57,7 @@ public class DeviceTaskAssignmentService : IDeviceTaskAssignmentService
                 device.HeartbeatInterval != 0 && SqlFunc.DateAdd(deviceRegistry.LastHeartbeatTime, device.HeartbeatInterval, DateType.Second) < DateTime.Now)
             .WhereIF(request.IsOffline.HasValue && !request.IsOffline.Value, (deviceTask, device, ga, gaLeave, deviceRegistry) =>
                 device.HeartbeatInterval == 0 || SqlFunc.DateAdd(deviceRegistry.LastHeartbeatTime, device.HeartbeatInterval, DateType.Second) >= DateTime.Now)
+            .Where((deviceTask, device) => device.Enable)
             .OrderBy(deviceTask => deviceTask.ModifiedTime, OrderByType.Desc)
             .Select((deviceTask, device, ga, gaLeave, deviceRegistry) => new DeviceTaskAssignmentResponse
             {