From 4b927cf68c3466b501bdf6112c04fbca82561c0b Mon Sep 17 00:00:00 2001
From: gdlcf88 <gdlcf88@outlook.com>
Date: Mon, 13 Jun 2022 13:48:09 +0800
Subject: [PATCH] Override `ApplyDefaultSorting` instead of `ApplySorting`

---
 .../ProductCategories/ProductCategoryAppService.cs         | 7 +++----
 .../EasyAbp/EShop/Products/Products/ProductAppService.cs   | 6 +++---
 .../EShop/Products/Products/ProductViewAppService.cs       | 7 +++----
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductCategories/ProductCategoryAppService.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductCategories/ProductCategoryAppService.cs
index 96431de5..991d7fd3 100644
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductCategories/ProductCategoryAppService.cs
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/ProductCategories/ProductCategoryAppService.cs
@@ -39,11 +39,10 @@ namespace EasyAbp.EShop.Products.ProductCategories
             return queryable;
         }
 
-        protected override IQueryable<ProductCategory> ApplySorting(IQueryable<ProductCategory> query,
-            GetProductCategoryListDto input)
+        protected override IQueryable<ProductCategory> ApplyDefaultSorting(IQueryable<ProductCategory> query)
         {
-            return base.ApplySorting(query, input)
-                .OrderBy(x => x.DisplayOrder);
+            return query.OrderBy(x => x.DisplayOrder)
+                .ThenBy(x => x.Id);
         }
 
         [RemoteService(false)]
diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductAppService.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductAppService.cs
index f5c46c35..9cc63dd6 100644
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductAppService.cs
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductAppService.cs
@@ -64,10 +64,10 @@ namespace EasyAbp.EShop.Products.Products
                 .WhereIf(!input.ShowUnpublished, x => x.IsPublished);
         }
 
-        protected override IQueryable<Product> ApplySorting(IQueryable<Product> query, GetProductListInput input)
+        protected override IQueryable<Product> ApplyDefaultSorting(IQueryable<Product> query)
         {
-            return base.ApplySorting(query, input)
-                .OrderBy(x => x.DisplayOrder);
+            return query.OrderBy(x => x.DisplayOrder)
+                .ThenBy(x => x.Id);
         }
 
         protected override Product MapToEntity(CreateUpdateProductDto createInput)
diff --git a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductViewAppService.cs b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductViewAppService.cs
index 6405d78a..69a83754 100644
--- a/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductViewAppService.cs
+++ b/modules/EasyAbp.EShop.Products/src/EasyAbp.EShop.Products.Application/EasyAbp/EShop/Products/Products/ProductViewAppService.cs
@@ -55,11 +55,10 @@ namespace EasyAbp.EShop.Products.Products
                 .WhereIf(!input.ShowUnpublished, x => x.IsPublished);
         }
 
-        protected override IQueryable<ProductView> ApplySorting(IQueryable<ProductView> query,
-            GetProductListInput input)
+        protected override IQueryable<ProductView> ApplyDefaultSorting(IQueryable<ProductView> query)
         {
-            return base.ApplySorting(query, input)
-                .OrderBy(x => x.DisplayOrder);
+            return query.OrderBy(x => x.DisplayOrder)
+                .ThenBy(x => x.Id);
         }
 
         public override async Task<PagedResultDto<ProductViewDto>> GetListAsync(GetProductListInput input)