From 5df49f3ebe29f5a1ab4ac718de2bff4a957277f6 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Wed, 10 Apr 2024 22:52:40 +0800
Subject: [PATCH] fix null userid

---
 .../TaskAssignment/Services/Implements/AssignmentService.cs     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs
index 510a4799..dc255557 100644
--- a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs
+++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/AssignmentService.cs
@@ -55,7 +55,7 @@ public class AssignmentService : IAssignmentService
              .OrderBy(deviceTask => deviceTask.CreateTime)
              .Select((deviceTask, deivce, deivceTamplate, ga, galeave, department) => new
              {
-                 UserId = SqlFunc.IsNull(deviceTask.UserId, ga.Id),
+                 UserId = SqlFunc.IsNull(SqlFunc.IsNull(deviceTask.UserId, ga.Id), galeave.Id),
                  TaskId = deviceTask.Id,
                  deviceTask.Type,
                  deviceTask.DeviceUniqueNo,