diff --git a/IRaCIS.Core.Application/Service/Document/AuditDocumentService.cs b/IRaCIS.Core.Application/Service/Document/AuditDocumentService.cs index a6cb2659d..b5c421053 100644 --- a/IRaCIS.Core.Application/Service/Document/AuditDocumentService.cs +++ b/IRaCIS.Core.Application/Service/Document/AuditDocumentService.cs @@ -84,13 +84,6 @@ public class AuditDocumentService(IRepository _auditDocumentRepos [HttpPost] public async Task> 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(); - } var auditRecordQueryable = _auditRecordRepository .WhereIf(inQuery.BeginAuditTime != null, t => t.AuditTime >= inQuery.BeginAuditTime) @@ -104,6 +97,7 @@ public class AuditDocumentService(IRepository _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(_mapper.ConfigurationProvider); var pageList = await auditRecordQueryable.ToPagedListAsync(inQuery); diff --git a/IRaCIS.Core.Application/Service/Document/DTO/AuditDocumentViewModel.cs b/IRaCIS.Core.Application/Service/Document/DTO/AuditDocumentViewModel.cs index 6f345181b..abb98487e 100644 --- a/IRaCIS.Core.Application/Service/Document/DTO/AuditDocumentViewModel.cs +++ b/IRaCIS.Core.Application/Service/Document/DTO/AuditDocumentViewModel.cs @@ -87,6 +87,8 @@ public class AuditRecordQuery : PageInput public DateTime? EndCreateTime { get; set; } public string? IdentityUserName { get; set; } + + public bool? IsViewTrainingRecord { get; set; } } public class SetAuditRecordPermissionCommand diff --git a/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs b/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs index 7189d817a..cdd1c622e 100644 --- a/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs +++ b/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs @@ -27,6 +27,7 @@ namespace IRaCIS.Core.Application.Services [ApiExplorerSettings(GroupName = "Trial")] public class TrialDocumentService(IRepository _trialDocumentRepository, IRepository _trialRepository, + IRepository _auditRecordRepository, IRepository _trialDocumentAttachmentRepository, ISystemDocumentService _systemDocumentService, IRepository _systemDocConfirmedUserRepository, @@ -918,6 +919,12 @@ 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()); + } + var systemDocQuery = from sysDoc in _systemDocumentRepository.AsQueryable(false) .Where(t => inQuery.UserTypeId != null ? t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == inQuery.UserTypeId) : true)