Skip to content

Commit 709a7ab

Browse files
committed
Merge branch 'stable' of github.com:microting/eform-backendconfiguration-plugin into stable
2 parents 4bbeff0 + b6b43e3 commit 709a7ab

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn/Services/BackendConfigurationReportService/BackendConfigurationReportService.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -257,17 +257,17 @@ await sdkDbContext.CheckListTranslations.FirstOrDefaultAsync(x =>
257257
reportModel.ItemHeaders.Add(kvp);
258258
}
259259
}
260+
var templateCaseIds = groupedCase.cases.Select(x => x.MicrotingSdkCaseId).ToList();
260261

261-
// images
262-
var templateCaseIds = groupedCase.cases.Select(x => (int?)x.MicrotingSdkCaseId).ToArray();
263262
var imagesForEform = await sdkDbContext.FieldValues
264263
.Include(x => x.UploadedData)
265-
.Where(x => x.WorkflowState != Constants.WorkflowStates.Removed)
266-
.Where(x => x.UploadedData.WorkflowState != Constants.WorkflowStates.Removed)
267-
.Where(x => x.Field.FieldTypeId == 5)
268-
.Where(x => templateCaseIds.Contains(x.CaseId))
269-
.Where(x => x.UploadedDataId != null)
264+
.Where(x => x.WorkflowState != Constants.WorkflowStates.Removed
265+
&& x.UploadedData.WorkflowState != Constants.WorkflowStates.Removed
266+
&& x.Field.FieldTypeId == 5 // magic number 5 - it is FieldTypes.Picture
267+
&& x.CaseId.HasValue && templateCaseIds.Contains(x.CaseId.Value)
268+
&& x.UploadedDataId != null)
270269
.OrderBy(x => x.CaseId)
270+
.AsNoTracking()
271271
.ToListAsync();
272272

273273
foreach (var imageField in imagesForEform)

0 commit comments

Comments
 (0)