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 9b8dd950..a16be254 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 @@ -34,6 +34,8 @@ namespace EasyAbp.EShop.Products.ProductCategories queryable = queryable.Where(x => x.ProductId == input.ProductId); } + queryable = queryable.OrderBy(x => x.DisplayOrder); + return queryable; } 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 0f1f3bc6..e6bd3796 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 @@ -61,7 +61,8 @@ namespace EasyAbp.EShop.Products.Products return query .Where(x => x.StoreId == input.StoreId) .WhereIf(!input.ShowHidden, x => !x.IsHidden) - .WhereIf(!input.ShowUnpublished, x => x.IsPublished); + .WhereIf(!input.ShowUnpublished, x => x.IsPublished) + .OrderBy(x => x.DisplayOrder); } protected override Product MapToEntity(CreateUpdateProductDto createInput) @@ -481,12 +482,12 @@ namespace EasyAbp.EShop.Products.Products protected virtual ProductDto SortAttributesAndOptions(ProductDto productDto) { - productDto.ProductAttributes = productDto.ProductAttributes.OrderByDescending(x => x.DisplayOrder).ToList(); + productDto.ProductAttributes = productDto.ProductAttributes.OrderBy(x => x.DisplayOrder).ToList(); foreach (var productAttributeDto in productDto.ProductAttributes) { productAttributeDto.ProductAttributeOptions = productAttributeDto.ProductAttributeOptions - .OrderByDescending(x => x.DisplayOrder).ToList(); + .OrderBy(x => x.DisplayOrder).ToList(); } return productDto; 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 efd24881..7eb6fde2 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 @@ -51,7 +51,8 @@ namespace EasyAbp.EShop.Products.Products return query .Where(x => x.StoreId == input.StoreId) .WhereIf(!input.ShowHidden, x => !x.IsHidden) - .WhereIf(!input.ShowUnpublished, x => x.IsPublished); + .WhereIf(!input.ShowUnpublished, x => x.IsPublished) + .OrderBy(x => x.DisplayOrder); } public override async Task> GetListAsync(GetProductListInput input)