diff --git a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs
index 2d166f8b..3275e898 100644
--- a/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs
+++ b/Src/Dlhis.ScheduledTask/DeviceUploadLog/Services/Implements/DeviceUploadLogService.cs
@@ -241,10 +241,17 @@ public class DeviceUploadLogService : IDeviceUploadLogService
                                                                    && x.RaiseDateTime <= request.SearchDateTimePeriod.End)
             .Where((x, device) => x.Type == type && x.UserType == userType)
             .WhereIF(request.Sync.HasValue, x => x.Sync == request.Sync)
-            .WhereIF(request.Search.IsPresent(), (x, device, ga, os) =>
-                x.UserUniqueNo == request.Search || x.DeviceUniqueNo == request.Search
+            .WhereIF(request.Search.IsPresent() && userType == GainfoUserTypeEnumType.Outsource, (x, device, ga, os) =>
+                x.UserUniqueNo == request.Search
+                || x.DeviceUniqueNo == request.Search
+                || os.Supplier == request.Search
+                || os.SapCode == request.Search
             )
-            .OrderBy(x => x.ModifiedTime, OrderByType.Desc)
+            .WhereIF(request.Search.IsPresent() && userType != GainfoUserTypeEnumType.Outsource, (x, device, ga, os) =>
+                x.UserUniqueNo == request.Search
+                || x.DeviceUniqueNo == request.Search
+            )
+            .OrderBy(x => x.RaiseDateTime, OrderByType.Desc)
             .Select((x, device, ga, os, gaSap) => new DeviceUploadLogResponse
             {
                 Id = x.Id,