From 40b4f5270c0f2c6060c26032765cdd3da2ae5ae2 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Mon, 4 Aug 2025 16:59:09 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=9F=A5=E8=AF=A2=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/Implements/DeviceTaskAssignmentService.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 {