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

fix 任务获取userid处理

Browse Source
This commit is contained in:
liguoyang
2024-06-18 17:55:49 +08:00
parent 6fa2c376a5
commit a2287cca9d
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -250,7 +250,9 @@ public class AssignmentService : IAssignmentService
.OrderBy(deviceTask => new { Priority = SqlFunc.Desc(deviceTask.Priority), deviceTask.CreateTime }) .OrderBy(deviceTask => new { Priority = SqlFunc.Desc(deviceTask.Priority), deviceTask.CreateTime })
.Select((deviceTask, device, deviceTemplate, ga, gaLeave, department, gainfoEx) => new TaskDto .Select((deviceTask, device, deviceTemplate, ga, gaLeave, department, gainfoEx) => new TaskDto
{ {
UserId = SqlFunc.IsNull(SqlFunc.IsNull(deviceTask.UserId, ga.Id), gaLeave.IdentityUserId), UserId = deviceTask.UserId == 0 || deviceTask.UserId == null
? gaLeave.IdentityUserId
: deviceTask.UserId,
TaskId = deviceTask.Id, TaskId = deviceTask.Id,
Type = deviceTask.Type, Type = deviceTask.Type,
DeviceUniqueNo = deviceTask.DeviceUniqueNo, DeviceUniqueNo = deviceTask.DeviceUniqueNo,