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 stringObjectMap = JacksonUtil.parseJSONStr2Map(req); List> projects = (List>) stringObjectMap.get("projects"); List collect = convert(projects, Constant.Topic_model, modelTagName, modelTypeName); - collect.sort(Comparator.comparing(ModelsVo::getPraisesCount).reversed()); - List result = collect.stream().skip((pageRequest.getPageNumber()) * pageRequest.getPageSize()).limit(pageRequest.getPageSize()). + List 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 stringObjectMap = JacksonUtil.parseJSONStr2Map(req); List> projects = (List>) stringObjectMap.get("projects"); List collect = convert(projects, Constant.Topic_model, modelTagName, modelTypeName); - collect.sort(Comparator.comparing(ModelsVo::getPraisesCount).reversed()); - List result = collect.stream().skip((pageRequest.getPageNumber()) * pageRequest.getPageSize()).limit(pageRequest.getPageSize()). + List 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> projects = (List>) stringObjectMap.get("projects"); List collect = convert(projects, Constant.Topic_Dataset, dataset.getDataTag(), dataset.getDataType()); - collect.sort(Comparator.comparing(NewDatasetVo::getPraisesCount).reversed()); - List result = collect.stream().skip((pageRequest.getPageNumber()) * pageRequest.getPageSize()).limit(pageRequest.getPageSize()). + List 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 collect = convert(projects, Constant.Topic_Dataset, dataset.getDataTag(), dataset.getDataType()); - collect.sort(Comparator.comparing(NewDatasetVo::getPraisesCount).reversed()); - List result = collect.stream().skip((pageRequest.getPageNumber()) * pageRequest.getPageSize()).limit(pageRequest.getPageSize()). + List 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()); }