Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs

@@ -231,7 +231,7 @@ namespace IRaCIS.Core.Application.Services
             #region 统一用户修改 
 
             var systemDocQuery =
-                 from sysDoc in _systemDocumentRepository.AsQueryable(true).Where(t => t.NeedConfirmedUserTypeList.Any(c => c.NeedConfirmUserTypeId == _userInfo.UserTypeId))
+                 from sysDoc in _systemDocumentRepository.AsQueryable(true).Include(x=>x.SystemDocumentAttachmentList).Where(t => t.NeedConfirmedUserTypeList.Any(c => c.NeedConfirmUserTypeId == _userInfo.UserTypeId))
                     //外部人员 只签署 外部需要签署的
                     .WhereIf(isInternal == false, t => t.DocUserSignType == DocUserSignType.InnerAndOuter)
                  from trialUser in _trialIdentityUserRepository.AsQueryable(false)
@@ -243,7 +243,7 @@ namespace IRaCIS.Core.Application.Services
                  select new UnionDocumentWithConfirmInfoView()
                  {
                      IsSystemDoc = true,
-
+                     AttachmentCount= sysDoc.SystemDocumentAttachmentList.Count(),
                      Id = sysDoc.Id,
                      CreateTime = sysDoc.CreateTime,
                      IsDeleted = sysDoc.IsDeleted,
@@ -517,7 +517,7 @@ namespace IRaCIS.Core.Application.Services
 
 
             var systemDocQuery =
-                 from sysDoc in _systemDocumentRepository.AsQueryable(false).Where(u => trialInfo.TrialFinishedTime != null ? u.CreateTime < trialInfo.TrialFinishedTime : true)
+                 from sysDoc in _systemDocumentRepository.AsQueryable(false).Include(x=>x.SystemDocumentAttachmentList).Where(u => trialInfo.TrialFinishedTime != null ? u.CreateTime < trialInfo.TrialFinishedTime : true)
                                                 .Where(t => inQuery.UserTypeId != null ? t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == inQuery.UserTypeId) : true)
                  from trialUser in _trialIdentityUserRepository.AsQueryable(false).Where(t => t.TrialId == inQuery.TrialId
                        && t.TrialUserRoleList.Any(t => sysDoc.NeedConfirmedUserTypeList.AsQueryable().Any(c => c.NeedConfirmUserTypeId == t.UserRole.UserTypeId)))
@@ -528,7 +528,7 @@ namespace IRaCIS.Core.Application.Services
                  select new UnionDocumentWithConfirmInfoView()
                  {
                      IsSystemDoc = true,
-
+                     AttachmentCount=sysDoc.SystemDocumentAttachmentList.Count,
                      Id = sysDoc.Id,
                      CreateTime = sysDoc.CreateTime,
                      IsDeleted = sysDoc.IsDeleted,