|
@@ -1145,15 +1145,17 @@ namespace Hotline.Application.Subscribers
|
|
|
{
|
|
|
var query = await _orderRepository.Queryable()
|
|
|
.LeftJoin<CallNative>((o, c) => o.CallId == c.Id)
|
|
|
- .Where((o, c) => !SqlFunc.IsNullOrEmpty(o.CallId) && c != null && callIds.Contains(o.CallId))
|
|
|
+ .Where((o, c) => !SqlFunc.IsNullOrEmpty(o.CallId) && callIds.Contains(o.CallId))
|
|
|
.Select((o, c) => new { Order = o, Call = c })
|
|
|
.ToListAsync(cancellationToken);
|
|
|
if (!query.Any()) return;
|
|
|
- var orderCalls = query.Select((o, c) => new PublishCallRecrodDto
|
|
|
- {
|
|
|
- Order = _mapper.Map<OrderDto>(o),
|
|
|
- TrCallRecordDto = _mapper.Map<TrCallDto>(c)
|
|
|
- }).ToList();
|
|
|
+ var orderCalls = query
|
|
|
+ .Where(d=>!SqlFunc.IsNullOrEmpty(d.Call.Id))
|
|
|
+ .Select(d => new PublishCallRecrodDto
|
|
|
+ {
|
|
|
+ Order = _mapper.Map<OrderDto>(d.Order),
|
|
|
+ TrCallRecordDto = _mapper.Map<TrCallDto>(d.Call)
|
|
|
+ }).ToList();
|
|
|
|
|
|
foreach (var orderCall in orderCalls)
|
|
|
{
|