From b8d64f1f282c360fb9c7a4d890bbf1107bf27ba3 Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Sun, 6 Oct 2024 14:27:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=8C=87=E5=AE=9A=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=9A=84=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=E4=BD=9C?=
 =?UTF-8?q?=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../da/service/impl/PortfolioServiceImpl.java | 91 ++++++++++---------
 1 file changed, 50 insertions(+), 41 deletions(-)

diff --git a/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java b/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java
index acf06ff3..518a90ec 100644
--- a/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java
@@ -430,7 +430,7 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
         // 查询用户的作品集
         if (query.getGetMyPortfolio() == 1) {
             qw.lambda().eq(Portfolio::getAccountId, userHolder.getId());
-        } else if (!Objects.isNull(query.getAccountId())) {
+        } else if (!Objects.isNull(query.getAccountId()) && !query.getAccountId().equals(0L)) {
             qw.lambda().eq(Portfolio::getAccountId, query.getAccountId());
         }
 
@@ -444,50 +444,59 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
             }
         }
 
-        List<Portfolio> topThree = new ArrayList<>();
-        List<Long> excludeIds = new ArrayList<>(); // 存放需要排除的 ID 列表
-
-        // 获取前三点赞和前三浏览的作品集，并将其排除在分页查询之外
-        if (query.getPage() == 1 && (query.getGetMyPortfolio() != 1 && query.getGetLikePortfolio() != 1)) {
-            // 获取前三点赞的作品集 ID
-            List<Long> topThreeLike = getTopThreeLikeFromRedis(RedisUtil.PORTFOLIO_LIKE_KEY);
-            List<Long> topThreeView = getTopThreeViewFromRedis(RedisUtil.PORTFOLIO_VIEW_KEY, topThreeLike);
-
-            // 获取前三点赞的作品集
-            if (!CollectionUtils.isEmpty(topThreeLike)) {
-                QueryWrapper<Portfolio> queryLike = new QueryWrapper<>();
-                queryLike.in("id", topThreeLike);
-                List<Portfolio> topThreeLikePortfolio = baseMapper.selectList(queryLike);
-                topThree.addAll(topThreeLikePortfolio);
-                excludeIds.addAll(topThreeLike); // 添加到排除 ID 列表
-            }
-
-            // 获取前三浏览的作品集
-            if (!CollectionUtils.isEmpty(topThreeView)) {
-                QueryWrapper<Portfolio> queryView = new QueryWrapper<>();
-                queryView.in("id", topThreeView);
-                List<Portfolio> topThreeViewPortfolio = baseMapper.selectList(queryView);
-                topThree.addAll(topThreeViewPortfolio);
-                excludeIds.addAll(topThreeView); // 添加到排除 ID 列表
-            }
-        }
-
-        // 在正常分页查询中排除前三点赞和前三浏览的作品集
-        if (!CollectionUtils.isEmpty(excludeIds)) {
-            qw.lambda().notIn(Portfolio::getId, excludeIds);
-        }
-
         // 按更新时间排序
         qw.lambda().orderByDesc(Portfolio::getUpdateDate);
+        IPage<Portfolio> page;
+        if (Objects.isNull(query.getAccountId()) && query.getGetMyPortfolio() != 1 && query.getGetLikePortfolio() != 1) {
+            List<Portfolio> topThree = new ArrayList<>();
+            List<Long> excludeIds = new ArrayList<>(); // 存放需要排除的 ID 列表
 
-        // 执行分页查询
-        IPage<Portfolio> page = portfolioMapper.selectPage(new Page<>(query.getPage(), query.getSize()), qw);
+            // 获取前三点赞和前三浏览的作品集，并将其排除在分页查询之外
+            if (query.getPage() == 1 && (query.getGetMyPortfolio() != 1 && query.getGetLikePortfolio() != 1)) {
+                // 获取前三点赞的作品集 ID
+                List<Long> topThreeLike = getTopThreeLikeFromRedis(RedisUtil.PORTFOLIO_LIKE_KEY);
+                List<Long> topThreeView = getTopThreeViewFromRedis(RedisUtil.PORTFOLIO_VIEW_KEY, topThreeLike);
 
-        // 如果前三点赞和浏览不为空，将它们添加到分页查询的结果最前面
-        if (!topThree.isEmpty() && (query.getGetMyPortfolio() != 1 && query.getGetLikePortfolio() != 1)) {
-            List<Portfolio> records = page.getRecords();
-            records.addAll(0, topThree);  // 添加到查询结果的开头
-            page.setRecords(records);
+                // 获取前三点赞的作品集
+                if (!CollectionUtils.isEmpty(topThreeLike)) {
+                    QueryWrapper<Portfolio> queryLike = new QueryWrapper<>();
+                    queryLike.in("id", topThreeLike);
+                    List<Portfolio> topThreeLikePortfolio = baseMapper.selectList(queryLike);
+                    topThree.addAll(topThreeLikePortfolio);
+                    excludeIds.addAll(topThreeLike); // 添加到排除 ID 列表
+                }
+
+                // 获取前三浏览的作品集
+                if (!CollectionUtils.isEmpty(topThreeView)) {
+                    QueryWrapper<Portfolio> queryView = new QueryWrapper<>();
+                    queryView.in("id", topThreeView);
+                    List<Portfolio> topThreeViewPortfolio = baseMapper.selectList(queryView);
+                    topThree.addAll(topThreeViewPortfolio);
+                    excludeIds.addAll(topThreeView); // 添加到排除 ID 列表
+                }
+            }
+
+            // 在正常分页查询中排除前三点赞和前三浏览的作品集
+            if (!CollectionUtils.isEmpty(excludeIds)) {
+                qw.lambda().notIn(Portfolio::getId, excludeIds);
+            }
+
+            // 执行分页查询
+            page = portfolioMapper.selectPage(new Page<>(query.getPage(), query.getSize()), qw);
+
+            // 如果前三点赞和浏览不为空，将它们添加到分页查询的结果最前面
+            if (!topThree.isEmpty()) {
+                List<Portfolio> records = page.getRecords();
+                if (!CollectionUtils.isEmpty(records)) {
+                    records.addAll(0, topThree);  // 添加到查询结果的开头
+                }else {
+                    records = topThree;
+                }
+                page.setRecords(records);
+            }
+        }else {
+            // 执行分页查询
+            page = portfolioMapper.selectPage(new Page<>(query.getPage(), query.getSize()), qw);
         }
 
         // 将 Portfolio 转换为 PortfolioVO 并进行相关处理