Merge pull request #202 from dotnetcore/bugfix/on-syslog-page-can-not…

…-loading-app-list Fixbug: can not search app when sort direction is null
dotnetcore · Dec 1, 2024 · 2ea36e1 · 2ea36e1
2 parents 3177b04 + 73bb0ac
commit 2ea36e1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj b/src/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj
@@ -3,11 +3,11 @@
 	<PropertyGroup>
 		<TargetFramework>net8.0</TargetFramework>
 		<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
-		<AssemblyVersion>1.9.8</AssemblyVersion>
-		<Version>1.9.7</Version>
-		<PackageVersion>1.9.8</PackageVersion>
+		<AssemblyVersion>1.9.9</AssemblyVersion>
+		<Version>1.9.9</Version>
+		<PackageVersion>1.9.9</PackageVersion>
 		<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-		<FileVersion>1.9.8</FileVersion>
+		<FileVersion>1.9.9</FileVersion>
 		<Authors>kklldog</Authors>
 		<Company>kklldog</Company>
 	</PropertyGroup>

diff --git a/src/AgileConfig.Server.Service/AppService.cs b/src/AgileConfig.Server.Service/AppService.cs
@@ -159,7 +159,7 @@ public Task<List<App>> GetAllAppsAsync()
             }
 
             var apps = await _appRepository.QueryPageAsync(exp, current, pageSize, sortField,
-                ascOrDesc.StartsWith("asc") ? "ASC" : "DESC");
+                ascOrDesc?.StartsWith("asc") ?? true ? "ASC" : "DESC");
             var count = await _appRepository.CountAsync(exp);
 
             return (apps, count);
@@ -230,7 +230,7 @@ public Task<List<App>> GetAllAppsAsync()
 
             if (sortProperty.TryGetValue(sortField, out var propertyInfo))
             {
-                appGroupList = ascOrDesc.StartsWith("asc")
+                appGroupList = ascOrDesc?.StartsWith("asc") ?? true
                     ? appGroupList.OrderBy(x => propertyInfo.GetValue(x.App, null)).ToList()
                     : appGroupList.OrderByDescending(x => propertyInfo.GetValue(x.App, null)).ToList();
             }