|
@@ -81,7 +81,7 @@ namespace Ropin.Inspection.Api.Controllers
|
|
|
try
|
|
|
{
|
|
|
var contentList = await _TsysMessageService.GetConditionAsync(searchModel);
|
|
|
- return new ApiResult<IEnumerable<TsysMessageViewModel>>(contentList);
|
|
|
+ return new ApiResult<PagesModel<TsysMessageViewModel>>(new PagesModel<TsysMessageViewModel>(contentList, searchModel));
|
|
|
}
|
|
|
catch (Exception ex)
|
|
|
{
|
|
@@ -101,11 +101,10 @@ namespace Ropin.Inspection.Api.Controllers
|
|
|
{
|
|
|
return new ApiResult(ReturnCode.ArgsError);
|
|
|
}
|
|
|
- searchModel.IsPagination = false;
|
|
|
try
|
|
|
{
|
|
|
var contentList = await _TsysMessageService.GetConditionScreenAsync(searchModel);
|
|
|
- return new ApiResult<IEnumerable<TsysMessageModel>>(contentList);
|
|
|
+ return new ApiResult<PagesModel<TsysMessageModel>>(new PagesModel<TsysMessageModel>(contentList, searchModel));
|
|
|
}
|
|
|
catch (Exception ex)
|
|
|
{
|