|
@@ -2935,13 +2935,16 @@ public class OrderController : BaseController
|
|
|
if (screen != null)
|
|
|
{
|
|
|
var ids = screen.FileJson.Select(x => x.Id).ToList();
|
|
|
- return await _fileRepository.GetFilesAsync(ids, HttpContext.RequestAborted);
|
|
|
+ allFiles = await _fileRepository.GetFilesAsync(ids, HttpContext.RequestAborted);
|
|
|
}
|
|
|
foreach (var step in steps)
|
|
|
{
|
|
|
- var ids = step.FileJson.Select(x => x.Id).ToList();
|
|
|
- var stepFiles = await _fileRepository.GetFilesAsync(ids, HttpContext.RequestAborted);
|
|
|
- allFiles.AddRange(stepFiles);
|
|
|
+ if (step.FileJson != null && step.FileJson.Any())
|
|
|
+ {
|
|
|
+ var ids = step.FileJson.Select(x => x.Id).ToList();
|
|
|
+ var stepFiles = await _fileRepository.GetFilesAsync(ids, HttpContext.RequestAborted);
|
|
|
+ allFiles.AddRange(stepFiles);
|
|
|
+ }
|
|
|
}
|
|
|
return allFiles;
|
|
|
}
|