From cbc15bffc95c486ec8fe67270d8d4e08de7b1407 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Mon, 06 May 2024 14:54:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java b/src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java
index 72555d3..f423170 100644
--- a/src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java
+++ b/src/main/java/com/dji/sample/media/service/impl/FileServiceImpl.java
@@ -103,7 +103,9 @@
// .eq(MediaFileEntity::getWorkspaceId, workspaceId)
// .orderByDesc(MediaFileEntity::getId));
Page<MediaFileEntity> pageData = mapper.selectPage(new Page<MediaFileEntity>(page, pageSize), new LambdaQueryWrapper<MediaFileEntity>()
- .eq(MediaFileEntity::getWorkspaceId,workspaceId));
+ .eq(MediaFileEntity::getWorkspaceId,workspaceId)
+ .orderByDesc(MediaFileEntity::getCreateTime));
+
List<MediaFileEntity> records = pageData.getRecords()
.stream()
.collect(Collectors.toList());
@@ -160,6 +162,7 @@
if (file != null) {
builder.fileName(file.getName())
.filePath(file.getPath())
+ .isadd(0)
.fingerprint(file.getFingerprint())
.objectKey(file.getObjectKey())
.subFileType(file.getSubFileType())
--
Gitblit v1.9.3