yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: .

Browse Source
This commit is contained in:
liguoyang
2026-05-22 11:26:05 +08:00
parent ef038d1b3e
commit 3fa80c7f21
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs
View File

@@ -248,9 +248,9 @@ public class AssignmentService : IAssignmentService
var taskIds = await _dbContext.Queryable<DeviceTaskEntity>() var taskIds = await _dbContext.Queryable<DeviceTaskEntity>()
.LeftJoin<DeviceEntity>((deviceTask, device) => deviceTask.DeviceUniqueNo == device.UniqueNo) .LeftJoin<DeviceEntity>((deviceTask, device) => deviceTask.DeviceUniqueNo == device.UniqueNo)
.Where((deviceTask, device) => deviceTask.UserNo == userInfo.UserNo) .Where((deviceTask, device) => deviceTask.UserNo == userInfo.UserNo)
.Where((deviceTask, device) => virtualDeviceUniqueNos.Contains(deviceTask.DeviceUniqueNo)) .Where((deviceTask, device) => virtualDeviceUniqueNos.Contains(deviceTask.DeviceUniqueNo) || deviceTask.Type == DeviceTaskEnumType.Delete)
.Where((deviceTask, device) => device.Enable) .Where((deviceTask, device) => device.Enable)
.Where(deviceTask => (deviceTask.Status == DeviceTaskStatusEnumType.Wait || deviceTask.Status == DeviceTaskStatusEnumType.Process || deviceTask.Type == DeviceTaskEnumType.Delete) .Where(deviceTask => (deviceTask.Status == DeviceTaskStatusEnumType.Wait || deviceTask.Status == DeviceTaskStatusEnumType.Process)
&& !string.IsNullOrEmpty(deviceTask.UserNo)) && !string.IsNullOrEmpty(deviceTask.UserNo))
.OrderBy(deviceTask => new { deviceTask.Id, Priority = SqlFunc.Desc(deviceTask.Priority) }) .OrderBy(deviceTask => new { deviceTask.Id, Priority = SqlFunc.Desc(deviceTask.Priority) })
.Select((deviceTask, device) => deviceTask.Id) .Select((deviceTask, device) => deviceTask.Id)