diff --git a/ZR.Repository/BaseRepository.cs b/ZR.Repository/BaseRepository.cs index 2bf476b..a5c3f17 100644 --- a/ZR.Repository/BaseRepository.cs +++ b/ZR.Repository/BaseRepository.cs @@ -367,7 +367,7 @@ namespace ZR.Repository page.PageSize = parm.PageSize; page.PageIndex = parm.PageNum; - page.Result = source.OrderByIF(parm.Sort.IsNotEmpty(), $"{parm.Sort} {(parm.SortType.Contains("desc") ? "desc" : "asc")}") + page.Result = source.OrderByIF(parm.Sort.IsNotEmpty(), $"{parm.Sort.ToSqlFilter()} {(parm.SortType.Contains("desc") ? "desc" : "asc")}") .ToPageList(parm.PageNum, parm.PageSize, ref total); page.TotalNum = total; return page; @@ -388,10 +388,11 @@ namespace ZR.Repository page.PageSize = parm.PageSize; page.PageIndex = parm.PageNum; - var result = source.OrderByIF(parm.Sort.IsNotEmpty(), $"{parm.Sort} {(parm.SortType.Contains("desc") ? "desc" : "asc")}") + var result = source + .OrderByIF(parm.Sort.IsNotEmpty(), $"{parm.Sort.ToSqlFilter()} {(parm.SortType.Contains("desc") ? "desc" : "asc")}") .ToPageList(parm.PageNum, parm.PageSize, ref total); + page.TotalNum = total; - page.Result = result.Adapt>(); return page; }