|
@@ -135,7 +135,7 @@ namespace Hotline.Api.Controllers
|
|
.Includes(it => it.SystemOrganize)
|
|
.Includes(it => it.SystemOrganize)
|
|
.Includes(it => it.Order)
|
|
.Includes(it => it.Order)
|
|
.WhereIF(pagedDto.PushBusiness.HasValue, d => d.PushBusiness == pagedDto.PushBusiness)
|
|
.WhereIF(pagedDto.PushBusiness.HasValue, d => d.PushBusiness == pagedDto.PushBusiness)
|
|
- .WhereIF(pagedDto.Status.HasValue, d => d.Status == pagedDto.Status)
|
|
|
|
|
|
+ .WhereIF(pagedDto.Status.HasValue, d => d.SendState == pagedDto.Status)
|
|
.WhereIF(!string.IsNullOrEmpty(pagedDto.Keyword), d => d.Name.Contains(pagedDto.Keyword!) || d.Content.Contains(pagedDto.Keyword!) || d.TelNumber.Contains(pagedDto.Keyword!) || d.User.Name.Contains(pagedDto.Keyword!) || d.SystemOrganize.Name.Contains(pagedDto.Keyword!))
|
|
.WhereIF(!string.IsNullOrEmpty(pagedDto.Keyword), d => d.Name.Contains(pagedDto.Keyword!) || d.Content.Contains(pagedDto.Keyword!) || d.TelNumber.Contains(pagedDto.Keyword!) || d.User.Name.Contains(pagedDto.Keyword!) || d.SystemOrganize.Name.Contains(pagedDto.Keyword!))
|
|
.WhereIF(pagedDto.StartTime.HasValue, d => d.SendTime >= pagedDto.StartTime)
|
|
.WhereIF(pagedDto.StartTime.HasValue, d => d.SendTime >= pagedDto.StartTime)
|
|
.WhereIF(pagedDto.EndTime.HasValue, d => d.SendTime <= pagedDto.EndTime)
|
|
.WhereIF(pagedDto.EndTime.HasValue, d => d.SendTime <= pagedDto.EndTime)
|