XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Test_IRC_Net8
he 2025-04-15 17:55:16 +08:00
parent 6fded9f028
commit 844e27e94e
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs
View File

@ -804,7 +804,6 @@ namespace IRaCIS.Core.Application.Services
select new UnionDocumentWithConfirmInfoView() select new UnionDocumentWithConfirmInfoView()
{ {
IsSystemDoc = true, IsSystemDoc = true,
Id = sysDoc.Id, Id = sysDoc.Id,
CreateTime = sysDoc.CreateTime, CreateTime = sysDoc.CreateTime,
IsDeleted = sysDoc.IsDeleted, IsDeleted = sysDoc.IsDeleted,
@ -855,9 +854,19 @@ namespace IRaCIS.Core.Application.Services
var identityUserUserTypeList = _identityUserRepository.Where(t => identityUserIdList.Contains(t.Id)).IgnoreQueryFilters().Select(t => new { IdentityUserId = t.Id, UserTypeList = t.UserRoleList.Where(t => t.IsUserRoleDisabled == false).Select(c => c.UserTypeRole.UserTypeShortName).ToList() }); var identityUserUserTypeList = _identityUserRepository.Where(t => identityUserIdList.Contains(t.Id)).IgnoreQueryFilters().Select(t => new { IdentityUserId = t.Id, UserTypeList = t.UserRoleList.Where(t => t.IsUserRoleDisabled == false).Select(c => c.UserTypeRole.UserTypeShortName).ToList() });
//Concat 不能用导航属性
var sysids = result.CurrentPageData.Where(t => t.IsSystemDoc == true).Select(t => t.Id).ToList();
var sysDataList = await _systemDocumentRepository.Where(x => sysids.Contains(x.Id)).Include(x => x.SystemDocumentAttachmentList).ToListAsync();
foreach (var item in result.CurrentPageData) foreach (var item in result.CurrentPageData)
{ {
if (sysDataList.Any(y => y.Id == item.Id))
{
item.AttachmentCount = sysDataList.Where(y => y.Id == item.Id).Select(x => x.SystemDocumentAttachmentList.Count()).FirstOrDefault();
}
if (item.IsSystemDoc) if (item.IsSystemDoc)
{ {
item.DocNeedSignUserTypeList = sysDocUserTypeList.Where(t => t.SystemDocumentId == item.Id).Select(t => t.UserTypeShortName).ToList(); item.DocNeedSignUserTypeList = sysDocUserTypeList.Where(t => t.SystemDocumentId == item.Id).Select(t => t.UserTypeShortName).ToList();