Skip to content

Commit 75e141f

Browse files
committed
[fix] 邮件队列查询条件优化
1 parent d87d631 commit 75e141f

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

Ape.Volo.Business/Queued/QueuedEmailService.cs

+2-3
Original file line numberDiff line numberDiff line change
@@ -220,11 +220,10 @@ private static Expression<Func<QueuedEmail, bool>> GetWhereExpression(
220220
whereExpression = whereExpression.AndAlso(x => x.SentTries < queuedEmailQueryCriteria.MaxTries);
221221
}
222222

223-
if (!queuedEmailQueryCriteria.Form.IsNullOrEmpty())
223+
if (queuedEmailQueryCriteria.EmailAccountId > 0)
224224
{
225225
whereExpression = whereExpression.AndAlso(x =>
226-
x.From.Contains(queuedEmailQueryCriteria.Form) ||
227-
x.FromName.Contains(queuedEmailQueryCriteria.Form));
226+
x.EmailAccountId == queuedEmailQueryCriteria.EmailAccountId);
228227
}
229228

230229
if (!queuedEmailQueryCriteria.To.IsNullOrEmpty())

Ape.Volo.IBusiness/QueryModel/QueuedEmailQueryCriteria.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class QueuedEmailQueryCriteria : DateRange
2121
/// <summary>
2222
/// 发送方
2323
/// </summary>
24-
public string Form { get; set; }
24+
public long EmailAccountId { get; set; }
2525

2626
/// <summary>
2727
/// 接收方

0 commit comments

Comments
 (0)