修改
continuous-integration/drone/push Build is passing Details

Uat_IRC_Net8
he 2025-05-08 14:49:57 +08:00
parent ee9ad472f0
commit 10cf908775
1 changed files with 7 additions and 4 deletions

View File

@ -252,9 +252,12 @@ public class AuditDocumentService(IRepository<AuditDocument> _auditDocumentRepos
var root = query var root = query
.Skip(inDto.PageSize * (inDto.PageIndex - 1)).Take(inDto.PageSize).ToList(); .Skip(inDto.PageSize * (inDto.PageIndex - 1)).Take(inDto.PageSize).ToList();
var historicalVersionList = await _auditDocumentRepository
.Where(x => x.AuditDocumentTypeEnum == AuditDocumentType.HistoricalVersion).ProjectTo<AuditDocumentData>(_mapper.ConfigurationProvider).ToListAsync();
foreach (var item in root) foreach (var item in root)
{ {
GetChildren(item, data); GetChildren(item, data, historicalVersionList);
} }
result.CurrentPageData = root; result.CurrentPageData = root;
@ -275,13 +278,13 @@ public class AuditDocumentService(IRepository<AuditDocument> _auditDocumentRepos
} }
private void GetChildren(AuditDocumentData item, List<AuditDocumentData> dataList) private void GetChildren(AuditDocumentData item, List<AuditDocumentData> dataList, List<AuditDocumentData> historyList)
{ {
item.Children = dataList.Where(x => x.ParentId == item.Id).ToList(); item.Children = dataList.Where(x => x.ParentId == item.Id).ToList();
item.HistoricalVersionsCount= dataList.Where(x => x.MainFileId == item.Id).Count(); item.HistoricalVersionsCount= historyList.Where(x => x.MainFileId == item.Id).Count();
foreach (var x in item.Children) foreach (var x in item.Children)
{ {
GetChildren(x, dataList); GetChildren(x, dataList, historyList);
} }
} }