From a2287cca9d4f7f4dc3af16e0aaf15a08db4927c5 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Tue, 18 Jun 2024 17:55:49 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E4=BB=BB=E5=8A=A1=E8=8E=B7=E5=8F=96useri?= =?UTF-8?q?d=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TaskAssignment/Services/Implements/AssignmentService.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs index e483fbad..ffe860d4 100644 --- a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs +++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs @@ -250,7 +250,9 @@ public class AssignmentService : IAssignmentService .OrderBy(deviceTask => new { Priority = SqlFunc.Desc(deviceTask.Priority), deviceTask.CreateTime }) .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, Type = deviceTask.Type, DeviceUniqueNo = deviceTask.DeviceUniqueNo,