From ccba16ed9eb3e77d1c90271e33302cc7686d5d98 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期四, 16 一月 2025 18:21:03 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java
index 8e1cc25..89c3337 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShareController.java
@@ -76,7 +76,7 @@
.eq(Share::getObjectId, objectId)
.eq(Share::getDelFlag, 0).or()
.eq(Share::getAddType, 1)
- .eq(Share::getDelFlag, 0));
+ .eq(Share::getDelFlag, 0).orderByDesc(Share::getCreateTime));
return R.ok(list);
}
@@ -86,7 +86,8 @@
public R<List<Share>> recommandlist() {
Long userid = tokenService.getLoginUserApplet().getUserid();
return R.ok(shareService.list(new LambdaQueryWrapper<Share>().eq(Share::getAddType, 2)
- .eq(Share::getObjectId, userid).or().eq(Share::getAddType, 1).eq(Share::getAuditStatus, 1).eq(Share::getDelFlag, 0)));
+ .eq(Share::getObjectId, userid).or().eq(Share::getAddType, 1).eq(Share::getAuditStatus, 1)
+ .eq(Share::getDelFlag, 0).orderByDesc(Share::getCreateTime)));
}
--
Gitblit v1.7.1