Skip to content

Commit 6d7d893

Browse files
committed
Fix list filtering in inspectionrecords
1 parent 91df8ab commit 6d7d893

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

api/Services/InspectionRecordService.cs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public class InspectionRecordParameters
4040
{
4141
public int PageNumber { get; set; } = 1;
4242
public int PageSize { get; set; } = 25;
43-
public string? InspectionId { get; set; }
43+
public List<string>? InspectionIds { get; set; }
4444
public string? Tag { get; set; }
4545
public string? InstallationCode { get; set; }
4646
public DateTime? MinCreationTime { get; set; }
@@ -274,9 +274,11 @@ InspectionRecordParameters parameters
274274
.ThenInclude(r => r.Workflows)
275275
.AsQueryable();
276276

277-
if (!string.IsNullOrWhiteSpace(parameters.InspectionId))
277+
if (parameters.InspectionIds != null && parameters.InspectionIds.Count > 0)
278278
query = query.Where(ir =>
279-
ir.InspectionId.ToLower().Contains(parameters.InspectionId.ToLower())
279+
parameters
280+
.InspectionIds.Select((i) => i.ToLower())
281+
.Contains(ir.InspectionId.ToLower())
280282
);
281283

282284
if (!string.IsNullOrWhiteSpace(parameters.Tag))
@@ -295,7 +297,7 @@ InspectionRecordParameters parameters
295297
if (parameters.MaxCreationTime != null)
296298
query = query.Where(ir => ir.CreatedAt < parameters.MaxCreationTime);
297299

298-
if (parameters.AnalysisTypes != null)
300+
if (parameters.AnalysisTypes != null && parameters.AnalysisTypes.Count > 0)
299301
{
300302
List<string> analysisTypeStrings =
301303
[

0 commit comments

Comments
 (0)