From fc8b51f40e71aa09bb49f407c1e9f68ac94ceb58 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 29 七月 2024 18:51:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java
index 5bbb2e4..a279095 100644
--- a/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java
+++ b/ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/GoodsSkuServiceImpl.java
@@ -393,11 +393,10 @@
wrapper3.le(GoodsSku::getYears, parseTime7)
.ge(GoodsSku::getYears, parseTime15);
}
- if (homeGoodsSkuDTO.getSort()==1){
- wrapper3.last(" ORDER BY IF(isnull(sort_num),1,0), sort_num ASC");
- }else{
- wrapper3.last(",IF(isnull(sort_num),1,0), sort_num ASC");
- }
+ wrapper3.orderByDesc(GoodsSku::getCreateTime);
+ wrapper3.last(",IF(isnull(sort_num),1,0), sort_num DESC");
+
+
Page<GoodsSku> page1 = this.page(page, wrapper3);
PageDTO<HomeGoodsSkuListVO> articleCommentsVOPageDTO = PageDTO.of(page1, HomeGoodsSkuListVO.class);
return articleCommentsVOPageDTO;
--
Gitblit v1.7.1