IRaCIS.Core.Application/Service/Common/EmailLogService.cs

@@ -4,14 +4,13 @@
 //     生成时间 2025-10-28 06:22:42Z 
 //     对此文件的更改可能会导致不正确的行为，并且如果重新生成代码，这些更改将会丢失。
 //--------------------------------------------------------------------
-using DocumentFormat.OpenXml.Wordprocessing;
-using IdentityModel.Client;
 using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Application.Interfaces;
 using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Infra.EFCore;
 using IRaCIS.Core.Infrastructure.Extention;
+using IdentityModel.Client;
 using MailKit;
 using MailKit.Net.Imap;
 using MailKit.Search;
@@ -20,11 +19,11 @@ using MassTransit;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
 using MimeKit;
-using Panda.DynamicWebApi.Attributes;
 using System.IO;
 using System.Linq;
 using System.Net.Mail;
 using System.Threading.Tasks;
+using Panda.DynamicWebApi.Attributes;
 namespace IRaCIS.Core.Application.Service;
 
 /// <summary>
@@ -56,14 +55,14 @@ public class EmailLogService(IRepository<EmailLog> _emailLogRepository,
     [HttpPost]
 	public async Task<PageOutput<EmailLogView>>  GetEmailLogList(EmailLogQuery inDto)
 	{
-        var emailFromName = await _trialRepository.Where(x=>x.Id==inDto.TrialId).Select(x=>x.EmailFromName).FirstOrDefaultAsync();
+        var emailFromEmail = await _trialRepository.Where(x=>x.Id==inDto.TrialId).Select(x=>x.EmailFromEmail).FirstOrDefaultAsync();
 
-        if (emailFromName.IsNullOrEmpty())
+        if (emailFromEmail.IsNullOrEmpty())
         {
-            emailFromName = _systemEmailConfig.FromName;
+            emailFromEmail = _systemEmailConfig.FromEmail;
         }
         var emailLogQueryable = _emailLogRepository
-            .Where(x=>x.SenderName== emailFromName)
+            .Where(x=>x.SenderAddress== emailFromEmail)
             .WhereIf(inDto.EmailStartDate.HasValue, x => x.EmailDate >= inDto.EmailStartDate.Value)
             .WhereIf(inDto.EmailEndDate.HasValue, x => x.EmailDate <= inDto.EmailEndDate.Value)
             .WhereIf(inDto.EmailStateEnum.HasValue, x => x.EmailStateEnum == inDto.EmailStateEnum.Value)