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

@@ -84,6 +84,13 @@ public class AuditDocumentService(IRepository<AuditDocument> _auditDocumentRepos
     [HttpPost]
     public async Task<PageOutput<AuditRecordView>> GetAuditRecordList(AuditRecordQuery inQuery)
     {
+        var isEA = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.EA;
+
+        //EA 但是没有在进行的培训记录查看权限，那么返回空数据
+        if (isEA && !_auditRecordRepository.Any(t => t.IsViewTrainingRecord && t.AuditState == AuditState.Ongoing))
+        {
+            return new PageOutput<AuditRecordView>();
+        }
 
         var auditRecordQueryable = _auditRecordRepository
             .WhereIf(inQuery.BeginAuditTime != null, t => t.AuditTime >= inQuery.BeginAuditTime)
@@ -97,7 +104,6 @@ public class AuditDocumentService(IRepository<AuditDocument> _auditDocumentRepos
             .WhereIf(inQuery.IdentityUserName.IsNotNullOrEmpty(), t => t.AuditRecordIdentityUserList.Any(c => c.IdentityUser.UserName.Contains(inQuery.IdentityUserName) || c.IdentityUser.FullName.Contains(inQuery.IdentityUserName)))
             .WhereIf(inQuery.CompanyName.IsNotNullOrEmpty(), t => t.CompanyName.Contains(inQuery.CompanyName))
             .WhereIf(inQuery.AuditContent.IsNotNullOrEmpty(), t => t.AuditContent.Contains(inQuery.AuditContent))
-            .WhereIf(inQuery.IsViewTrainingRecord != null, t => t.IsViewTrainingRecord == inQuery.IsViewTrainingRecord)
             .ProjectTo<AuditRecordView>(_mapper.ConfigurationProvider);
 
         var pageList = await auditRecordQueryable.ToPagedListAsync(inQuery);

IRaCIS.Core.Application/Service/Document/DTO/AuditDocumentViewModel.cs

@@ -87,8 +87,6 @@ public class AuditRecordQuery : PageInput
     public DateTime? EndCreateTime { get; set; }
 
     public string? IdentityUserName { get; set; }
-
-    public bool? IsViewTrainingRecord { get; set; }
 }
 
 public class SetAuditRecordPermissionCommand

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

@@ -27,7 +27,6 @@ namespace IRaCIS.Core.Application.Services
     [ApiExplorerSettings(GroupName = "Trial")]
     public class TrialDocumentService(IRepository<TrialDocument> _trialDocumentRepository,
         IRepository<Trial> _trialRepository,
-        IRepository<AuditRecord> _auditRecordRepository,
         IRepository<TrialDocumentAttachment> _trialDocumentAttachmentRepository,
         ISystemDocumentService _systemDocumentService,
         IRepository<SystemDocConfirmedIdentityUser> _systemDocConfirmedUserRepository,
@@ -919,12 +918,6 @@ namespace IRaCIS.Core.Application.Services
 
             var isEA = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.EA;
 
-            //EA 但是没有在进行的培训记录查看权限，那么返回空数据
-            if (isEA && !_auditRecordRepository.Any(t => t.IsViewTrainingRecord && t.AuditState == AuditState.Ongoing))
-            {
-                return ResponseOutput.Ok(new PageOutput<UnionDocumentWithConfirmInfoView>());
-            }
-
             var systemDocQuery =
                from sysDoc in _systemDocumentRepository.AsQueryable(false)
                                               .Where(t => inQuery.UserTypeId != null ? t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == inQuery.UserTypeId) : true)