From 111ade2f498a0bebe34255d59c9c62427331dd45 Mon Sep 17 00:00:00 2001
From: chenzhihang <709011834@qq.com>
Date: Tue, 20 May 2025 16:49:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B9=E7=9B=AE=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/platform/service/impl/ModelsServiceImpl.java  | 6 ++----
 .../ruoyi/platform/service/impl/NewDatasetServiceImpl.java  | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java
index 73089a67..83f0eba3 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelsServiceImpl.java
@@ -950,8 +950,7 @@ public class ModelsServiceImpl implements ModelsService {
         Map<String, Object> stringObjectMap = JacksonUtil.parseJSONStr2Map(req);
         List<Map<String, Object>> projects = (List<Map<String, Object>>) stringObjectMap.get("projects");
         List<ModelsVo> collect = convert(projects, Constant.Topic_model, modelTagName, modelTypeName);
-        collect.sort(Comparator.comparing(ModelsVo::getPraisesCount).reversed());
-        List<ModelsVo> result = collect.stream().skip((pageRequest.getPageNumber()) * pageRequest.getPageSize()).limit(pageRequest.getPageSize()).
+        List<ModelsVo> result = collect.stream().sorted(Comparator.comparing(ModelsVo::getPraisesCount).reversed()).skip((pageRequest.getPageNumber()) * pageRequest.getPageSize()).limit(pageRequest.getPageSize()).
                 collect(Collectors.toList());
         return new PageImpl<>(result, pageRequest, collect.size());
     }
@@ -980,8 +979,7 @@ public class ModelsServiceImpl implements ModelsService {
         Map<String, Object> stringObjectMap = JacksonUtil.parseJSONStr2Map(req);
         List<Map<String, Object>> projects = (List<Map<String, Object>>) stringObjectMap.get("projects");
         List<ModelsVo> collect = convert(projects, Constant.Topic_model, modelTagName, modelTypeName);
-        collect.sort(Comparator.comparing(ModelsVo::getPraisesCount).reversed());
-        List<ModelsVo> result = collect.stream().skip((pageRequest.getPageNumber()) * pageRequest.getPageSize()).limit(pageRequest.getPageSize()).
+        List<ModelsVo> result = collect.stream().sorted(Comparator.comparing(ModelsVo::getPraisesCount).reversed()).skip((pageRequest.getPageNumber()) * pageRequest.getPageSize()).limit(pageRequest.getPageSize()).
                 collect(Collectors.toList());
         return new PageImpl<>(result, pageRequest, collect.size());
     }
diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java
index c809238c..d14c17d4 100644
--- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java
+++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/NewDatasetServiceImpl.java
@@ -333,8 +333,7 @@ public class NewDatasetServiceImpl implements NewDatasetService {
         List<Map<String, Object>> projects = (List<Map<String, Object>>) stringObjectMap.get("projects");
 
         List<NewDatasetVo> collect = convert(projects, Constant.Topic_Dataset, dataset.getDataTag(), dataset.getDataType());
-        collect.sort(Comparator.comparing(NewDatasetVo::getPraisesCount).reversed());
-        List<NewDatasetVo> result = collect.stream().skip((pageRequest.getPageNumber()) * pageRequest.getPageSize()).limit(pageRequest.getPageSize()).
+        List<NewDatasetVo> result = collect.stream().sorted(Comparator.comparing(NewDatasetVo::getPraisesCount).reversed()).skip((pageRequest.getPageNumber()) * pageRequest.getPageSize()).limit(pageRequest.getPageSize()).
                 collect(Collectors.toList());
         return new PageImpl<>(result, pageRequest, collect.size());
     }
@@ -357,8 +356,7 @@ public class NewDatasetServiceImpl implements NewDatasetService {
             return new PageImpl<>(new ArrayList<>(), pageRequest, 0);
         }
         List<NewDatasetVo> collect = convert(projects, Constant.Topic_Dataset, dataset.getDataTag(), dataset.getDataType());
-        collect.sort(Comparator.comparing(NewDatasetVo::getPraisesCount).reversed());
-        List<NewDatasetVo> result = collect.stream().skip((pageRequest.getPageNumber()) * pageRequest.getPageSize()).limit(pageRequest.getPageSize()).
+        List<NewDatasetVo> result = collect.stream().sorted(Comparator.comparing(NewDatasetVo::getPraisesCount).reversed()).skip((pageRequest.getPageNumber()) * pageRequest.getPageSize()).limit(pageRequest.getPageSize()).
                 collect(Collectors.toList());
         return new PageImpl<>(result, pageRequest, collect.size());
     }