From 6c02ec336407230f5632b7ad1d3b009edbe3b097 Mon Sep 17 00:00:00 2001
From: ls <lslvxy@163.com>
Date: Sat, 16 Nov 2024 10:55:54 +0800
Subject: [PATCH] update

---
 .../jeecg/modules/database/entity/DocumentHome.java   |  2 +-
 .../database/service/IDocumentFavoritesService.java   |  3 +--
 .../service/impl/DocumentFavoritesServiceImpl.java    | 11 +++--------
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/DocumentHome.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/DocumentHome.java
index 779b2d6..9c811d3 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/DocumentHome.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/DocumentHome.java
@@ -21,7 +21,7 @@ public class DocumentHome implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Schema(description = "我的收藏")
-    private List<DocumentLibrary> favorite;
+    private List<DocumentFavorites> favorite;
     @Schema(description = "最新文档")
     private List<DocumentLibrary>   latest;
     @Schema(description = "最近访问")
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IDocumentFavoritesService.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IDocumentFavoritesService.java
index e1f1311..674ca6d 100755
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IDocumentFavoritesService.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/IDocumentFavoritesService.java
@@ -2,7 +2,6 @@ package org.jeecg.modules.database.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.database.entity.DocumentFavorites;
-import org.jeecg.modules.database.entity.DocumentLibrary;
 
 import java.util.List;
 
@@ -13,7 +12,7 @@ import java.util.List;
  * @Version: V1.0
  */
 public interface IDocumentFavoritesService extends IService<DocumentFavorites> {
-    List<DocumentLibrary> getTopFavoritesByUserId(String userId);
+    List<DocumentFavorites> getTopFavoritesByUserId(String userId);
     DocumentFavorites getByDocIdAndUserId(String userId,String documentId);
 
     void removeByDocId(String documentId);
diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/DocumentFavoritesServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/DocumentFavoritesServiceImpl.java
index 69d32d3..a904e85 100755
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/DocumentFavoritesServiceImpl.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/DocumentFavoritesServiceImpl.java
@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.modules.database.entity.DocumentFavorites;
-import org.jeecg.modules.database.entity.DocumentLibrary;
 import org.jeecg.modules.database.mapper.DocumentFavoritesMapper;
 import org.jeecg.modules.database.service.IDocumentFavoritesService;
 import org.jeecg.modules.database.service.IDocumentLibraryService;
@@ -12,8 +11,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
 
 /**
  * @Description: 我的收藏文档
@@ -28,14 +25,12 @@ public class DocumentFavoritesServiceImpl extends ServiceImpl<DocumentFavoritesM
     private IDocumentLibraryService documentLibraryService;
 
     @Override
-    public List<DocumentLibrary> getTopFavoritesByUserId(String userId) {
+    public List<DocumentFavorites> getTopFavoritesByUserId(String userId) {
         LambdaQueryWrapper<DocumentFavorites> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(DocumentFavorites::getUserId, userId);
-        Page<DocumentFavorites> page = new Page<>(1, 5);
+        Page<DocumentFavorites> page = new Page<>(1, 10);
         List<DocumentFavorites> list = list(page, queryWrapper);
-        List<DocumentLibrary> result = list.stream().map(visitHistory -> documentLibraryService.getById(visitHistory.getDocumentId()))
-                .filter(Objects::nonNull).collect(Collectors.toList());
-        return result;
+        return list;
     }
 
     @Override