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

Test_IRC_Net8
he 2025-11-13 09:25:03 +08:00
parent 342b567e2c
commit 52dd676cf9
1 changed files with 4 additions and 4 deletions

View File

@ -51,14 +51,14 @@ public class EmailLogService(IRepository<EmailLog> _emailLogRepository,
[HttpPost] [HttpPost]
public async Task<PageOutput<EmailLogView>> GetEmailLogList(EmailLogQuery inDto) public async Task<PageOutput<EmailLogView>> GetEmailLogList(EmailLogQuery inDto)
{ {
var emailFromEmail = await _trialRepository.Where(x=>x.Id==inDto.TrialId).Select(x=>x.EmailFromEmail).FirstOrDefaultAsync(); var emailFromName = await _trialRepository.Where(x=>x.Id==inDto.TrialId).Select(x=>x.EmailFromName).FirstOrDefaultAsync();
if (emailFromEmail.IsNullOrEmpty()) if (emailFromName.IsNullOrEmpty())
{ {
emailFromEmail = _systemEmailConfig.FromEmail; emailFromName = _systemEmailConfig.FromName;
} }
var emailLogQueryable = _emailLogRepository var emailLogQueryable = _emailLogRepository
.Where(x=>x.SenderAddress== emailFromEmail) .Where(x=>x.SenderName== emailFromName)
.WhereIf(inDto.EmailStartDate.HasValue, x => x.EmailDate >= inDto.EmailStartDate.Value) .WhereIf(inDto.EmailStartDate.HasValue, x => x.EmailDate >= inDto.EmailStartDate.Value)
.WhereIf(inDto.EmailEndDate.HasValue, x => x.EmailDate <= inDto.EmailEndDate.Value) .WhereIf(inDto.EmailEndDate.HasValue, x => x.EmailDate <= inDto.EmailEndDate.Value)
.WhereIf(inDto.EmailStateEnum.HasValue, x => x.EmailStateEnum == inDto.EmailStateEnum.Value) .WhereIf(inDto.EmailStateEnum.HasValue, x => x.EmailStateEnum == inDto.EmailStateEnum.Value)