From e8bb6941d2d55a558c4d1fe7363723b7fec4dec2 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Wed, 8 Jan 2025 17:53:19 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E6=8E=92=E5=BA=8F,=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Services/Implements/DeviceUploadLogService.cs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) 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,