This commit is contained in:
2024-04-09 21:38:41 +08:00
parent 25d33c36eb
commit e745af6da8
2 changed files with 4 additions and 4 deletions

View File

@@ -30,9 +30,9 @@ public class DeviceUploadLogService : IDeviceUploadLogService
.WhereIF(request.SearchDateTimePeriod?.Start.HasValue == true, deviceUp => deviceUp.RaiseDateTime >= request.SearchDateTimePeriod.Start)
.WhereIF(request.SearchDateTimePeriod?.End.HasValue == true, deviceUp => deviceUp.RaiseDateTime <= request.SearchDateTimePeriod.End)
.WhereIF(request.Search.IsPresent(), (deviceUp, device, ga) =>
ga.Code.Contains(request.Search)
|| ga.Name.Contains(request.Search)
|| deviceUp.DeviceUniqueNo.Contains(request.Search)
ga.Code == request.Search
|| ga.Name == request.Search
|| deviceUp.DeviceUniqueNo == request.Search
)
.OrderBy(deviceUp => deviceUp.CreateTime, OrderByType.Desc)
.Select((deviceUp, device, ga) => new DeviceUploadLogResponse