diff --git a/ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs b/ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs index d9c1289..f19897f 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs @@ -36,8 +36,8 @@ namespace ZR.Admin.WebApi.Controllers.System [HttpGet("list")] public IActionResult List([FromQuery] SysDictType dict, [FromQuery] PagerInfo pagerInfo) { - var list = SysDictService.SelectDictTypeList(dict); - pagerInfo.TotalNum = list.Count; + var list = SysDictService.SelectDictTypeList(dict, pagerInfo); + var vm = new VMPageResult(list, pagerInfo); return SUCCESS(vm, TIME_FORMAT_FULL); } diff --git a/ZR.Repository/System/SysDictRepository.cs b/ZR.Repository/System/SysDictRepository.cs index f30a142..ba12198 100644 --- a/ZR.Repository/System/SysDictRepository.cs +++ b/ZR.Repository/System/SysDictRepository.cs @@ -17,13 +17,17 @@ namespace ZR.Repository.System /// /// 实体模型 /// - public List SelectDictTypeList(SysDictType dictType) + public List SelectDictTypeList(SysDictType dictType, Model.PagerInfo pager) { - return Db + var totalNum = 0; + var list = Db .Queryable() .WhereIF(!string.IsNullOrEmpty(dictType.DictName), it => it.DictName.Contains(dictType.DictName)) .WhereIF(!string.IsNullOrEmpty(dictType.Status), it => it.Status == dictType.Status) - .WhereIF(!string.IsNullOrEmpty(dictType.DictType), it => it.DictType == dictType.DictType).ToList(); + .WhereIF(!string.IsNullOrEmpty(dictType.DictType), it => it.DictType == dictType.DictType) + .ToPageList(pager.PageNum, pager.PageSize, ref totalNum); + pager.TotalNum = totalNum; + return list; } /// diff --git a/ZR.Service/IService/ISysDictService.cs b/ZR.Service/IService/ISysDictService.cs index f2d0697..b279ed8 100644 --- a/ZR.Service/IService/ISysDictService.cs +++ b/ZR.Service/IService/ISysDictService.cs @@ -10,7 +10,7 @@ namespace ZR.Service.IService /// public interface ISysDictService: IBaseService { - public List SelectDictTypeList(SysDictType dictType); + public List SelectDictTypeList(SysDictType dictType, Model.PagerInfo pager); /// /// 根据Id查询 diff --git a/ZR.Service/System/SysDictService.cs b/ZR.Service/System/SysDictService.cs index 3eef28a..2b39f20 100644 --- a/ZR.Service/System/SysDictService.cs +++ b/ZR.Service/System/SysDictService.cs @@ -29,9 +29,9 @@ namespace ZR.Service.System /// /// 实体模型 /// - public List SelectDictTypeList(SysDictType dictType) + public List SelectDictTypeList(SysDictType dictType, Model.PagerInfo pager) { - return sysDictRepository.SelectDictTypeList(dictType); + return sysDictRepository.SelectDictTypeList(dictType, pager); } ///