From 9780d8c5b5e939e605db3b9866e4e9add779307a Mon Sep 17 00:00:00 2001
From: xbzhu <5430389+xbzhu@user.noreply.gitee.com>
Date: Fri, 21 Apr 2023 01:57:31 +0000
Subject: [PATCH] =?UTF-8?q?update=20ZR.Repository/BaseRepository.cs.=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86ToPage=E6=96=B9=E6=B3=95=E4=B8=ADpar?=
 =?UTF-8?q?m.Sort=E4=B8=8D=E4=B8=BAnull=EF=BC=8C=E4=BD=86parm.SortType?=
 =?UTF-8?q?=E4=B8=BAnull=E6=8A=A5=E9=94=99=E5=BC=82=E5=B8=B8=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: xbzhu <5430389+xbzhu@user.noreply.gitee.com>
---
 ZR.Repository/BaseRepository.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ZR.Repository/BaseRepository.cs b/ZR.Repository/BaseRepository.cs
index 26dcf40..36a8559 100644
--- a/ZR.Repository/BaseRepository.cs
+++ b/ZR.Repository/BaseRepository.cs
@@ -1,4 +1,4 @@
-using Infrastructure.Extensions;
+using Infrastructure.Extensions;
 using Mapster;
 using SqlSugar;
 using SqlSugar.IOC;
@@ -367,7 +367,7 @@ namespace ZR.Repository
             page.PageSize = parm.PageSize;
             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);
             page.TotalNum = total;
             return page;
@@ -389,7 +389,7 @@ namespace ZR.Repository
             page.PageIndex = parm.PageNum;
 
             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);
             
             page.TotalNum = total;