From f52b09e5e82dac316785cfb2167cdbd4bc303c41 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Mon, 26 Aug 2024 16:24:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=92=E5=BA=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../NewtonsoftJson/NewtonsoftJsonSetup.cs                   | 2 +-
 .../NewtonsoftJson/ObjectStorePathConvert.cs                | 6 ++----
 .../_IRaCIS/IQueryablePageListExtensions.cs                 | 4 ++++
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/IRaCIS.Core.API/_ServiceExtensions/NewtonsoftJson/NewtonsoftJsonSetup.cs b/IRaCIS.Core.API/_ServiceExtensions/NewtonsoftJson/NewtonsoftJsonSetup.cs
index 9671fffca..69032ff19 100644
--- a/IRaCIS.Core.API/_ServiceExtensions/NewtonsoftJson/NewtonsoftJsonSetup.cs
+++ b/IRaCIS.Core.API/_ServiceExtensions/NewtonsoftJson/NewtonsoftJsonSetup.cs
@@ -14,7 +14,7 @@ namespace IRaCIS.Core.API
         {
             services.AddHttpContextAccessor();
             services.AddScoped<JSONTimeZoneConverter>();
-            services.AddScoped<CustomStringConverter>();
+            services.AddScoped<ObjectStorePathConvert>();
             services.AddScoped<IOSSService,OSSService>();
 
             builder.AddNewtonsoftJson(options =>
diff --git a/IRaCIS.Core.API/_ServiceExtensions/NewtonsoftJson/ObjectStorePathConvert.cs b/IRaCIS.Core.API/_ServiceExtensions/NewtonsoftJson/ObjectStorePathConvert.cs
index b9df7af84..e7d4aad48 100644
--- a/IRaCIS.Core.API/_ServiceExtensions/NewtonsoftJson/ObjectStorePathConvert.cs
+++ b/IRaCIS.Core.API/_ServiceExtensions/NewtonsoftJson/ObjectStorePathConvert.cs
@@ -9,15 +9,13 @@ using System.Text.RegularExpressions;
 
 namespace IRaCIS.Core.API._ServiceExtensions.NewtonsoftJson
 {
-    public class CustomStringConverter : JsonConverter<string>
+    public class ObjectStorePathConvert : JsonConverter<string>
     {
-        //private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly IOSSService _oSSService;
 
         // 构造函数
-        public CustomStringConverter(/*IHttpContextAccessor httpContextAccessor*/ IOSSService oSSService)
+        public ObjectStorePathConvert( IOSSService oSSService)
         {
-            //_httpContextAccessor = httpContextAccessor;
             _oSSService = oSSService;
         }
 
diff --git a/IRaCIS.Core.Infrastructure/_IRaCIS/IQueryablePageListExtensions.cs b/IRaCIS.Core.Infrastructure/_IRaCIS/IQueryablePageListExtensions.cs
index 5fdbf8e2c..f423446c4 100644
--- a/IRaCIS.Core.Infrastructure/_IRaCIS/IQueryablePageListExtensions.cs
+++ b/IRaCIS.Core.Infrastructure/_IRaCIS/IQueryablePageListExtensions.cs
@@ -140,6 +140,10 @@ namespace IRaCIS.Core.Infrastructure.Extention
             {
                 propName = sortField;
             }
+            else
+            {
+                propName= pageInput.SortField;
+            }
 
             source = string.IsNullOrWhiteSpace(propName) ? source : (pageInput.Asc ? source.OrderBy(propName) : source.OrderBy(propName + " desc"));