From 6217b0cafde0e1b9526f49ffb386eeaed9101b5e Mon Sep 17 00:00:00 2001 From: liguoyang Date: Mon, 4 Aug 2025 16:41:27 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E8=BF=87=E6=BB=A4=E6=9C=AA=E5=90=AF?= =?UTF-8?q?=E7=94=A8=E8=AE=BE=E5=A4=87=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/Implements/DeviceTaskAssignmentService.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs index 4a9ddd27..fd92c962 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 => deviceTask.DeviceType == request.Type) + .WhereIF(request.Type.HasValue, (deviceTask, device) => deviceTask.DeviceType == request.Type && device.Enable) //过滤未启用的设备任务 .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) => @@ -189,9 +189,9 @@ public class DeviceTaskAssignmentService : IDeviceTaskAssignmentService .ToListAsync(); await _dbContext.Client.Deleteable() - .Where(x=> request.Ids.Contains(x.Id)) + .Where(x => request.Ids.Contains(x.Id)) .ExecuteCommandAsync(); - + tasks.ForEach(x => { x.Status = DeviceTaskStatusEnumType.Wait;