diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs
index 23a8d100..4d9ed971 100644
--- a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs
+++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs
@@ -47,10 +47,11 @@ public class DeviceTaskAssignmentService : IDeviceTaskAssignmentService
             .WhereIF(request.Type.HasValue, deviceTask => deviceTask.DeviceType == request.Type)
             .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) =>
+            .WhereIF(!request.Search.IsEmpty(), (deviceTask, device, ga, gaLeave) =>
                 ga.Name == request.Search
                 || ga.Code == request.Search
                 || deviceTask.DeviceUniqueNo == request.Search
+                || gaLeave.Code == request.Search
             )
             .WhereIF(request.IsOffline.HasValue && request.IsOffline.Value, (deviceTask, device, ga, gaLeave, deviceRegistry) =>
                 device.HeartbeatInterval != 0 && SqlFunc.DateAdd(deviceRegistry.LastHeartbeatTime, device.HeartbeatInterval, DateType.Second) < DateTime.Now)