|
|
@@ -3734,15 +3734,16 @@ public class OrderController : BaseController
|
|
|
/// <param name="id"></param>
|
|
|
/// <returns></returns>
|
|
|
[HttpGet("repeatable_event")]
|
|
|
- public async Task<RepeatableEvent> CitizenEntity([FromQuery] RepeatableEventEntityDto dto)
|
|
|
+ public async Task<RepeatableEventDto> CitizenEntity([FromQuery] RepeatableEventEntityDto dto)
|
|
|
{
|
|
|
- return await _repeatableEventRepository.Queryable()
|
|
|
+ var repeatableEvent = await _repeatableEventRepository.Queryable()
|
|
|
.Includes(x =>
|
|
|
x.Details.WhereIF(!string.IsNullOrEmpty(dto.Keyword), x => x.Order.Title.Contains(dto.Keyword!))
|
|
|
.ToList())
|
|
|
.Includes(x => x.Details, y => y.Order)
|
|
|
.FirstAsync(x => x.Id == dto.Id);
|
|
|
- }
|
|
|
+ return _mapper.Map<RepeatableEventDto>(repeatableEvent);
|
|
|
+ }
|
|
|
|
|
|
#endregion
|
|
|
|
