wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!29 修改了ToPage方法中parm.Sort不为null，但parm.SortType为null报错异常。

Browse Source 
Merge pull request !29 from xbzhu/N/A
This commit is contained in:
字母搬运工 2023-05-10 12:28:08 +00:00 committed by Gitee
commit 0c63852f2a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ZR.Repository/BaseRepository.cs
View File

@ -1,4 +1,4 @@
using Infrastructure.Extensions; using Infrastructure.Extensions;
using Mapster; using Mapster;
using SqlSugar; using SqlSugar;
using SqlSugar.IOC; using SqlSugar.IOC;
@ -367,7 +367,7 @@ namespace ZR.Repository
page.PageSize = parm.PageSize; page.PageSize = parm.PageSize;
page.PageIndex = parm.PageNum; page.PageIndex = parm.PageNum;
page.Result = source.OrderByIF(parm.Sort.IsNotEmpty(), $"{parm.Sort.ToSqlFilter()} {(parm.SortType.Contains("desc") ? "desc" : "asc")}") page.Result = source.OrderByIF(parm.Sort.IsNotEmpty(), $"{parm.Sort.ToSqlFilter()} {(!string.IsNullOrWhiteSpace(parm.SortType) && parm.SortType.Contains("desc") ? "desc" : "asc")}")
.ToPageList(parm.PageNum, parm.PageSize, ref total); .ToPageList(parm.PageNum, parm.PageSize, ref total);
page.TotalNum = total; page.TotalNum = total;
return page; return page;
@ -389,7 +389,7 @@ namespace ZR.Repository
page.PageIndex = parm.PageNum; page.PageIndex = parm.PageNum;
var result = source var result = source
.OrderByIF(parm.Sort.IsNotEmpty(), $"{parm.Sort.ToSqlFilter()} {(parm.SortType.Contains("desc") ? "desc" : "asc")}") .OrderByIF(parm.Sort.IsNotEmpty(), $"{parm.Sort.ToSqlFilter()} {(!string.IsNullOrWhiteSpace(parm.SortType) && parm.SortType.Contains("desc") ? "desc" : "asc")}")
.ToPageList(parm.PageNum, parm.PageSize, ref total); .ToPageList(parm.PageNum, parm.PageSize, ref total);
page.TotalNum = total; page.TotalNum = total;