From c439f41d699bb6f3646ed5f5e62cec93e426c49b Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Wed, 9 Oct 2024 16:42:45 +0800
Subject: [PATCH] =?UTF-8?q?bugfix:=E5=8F=82=E4=B8=8E=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E4=BD=9C=E5=93=81=E4=B8=BA0=E6=97=B6=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=87=BA=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../da/service/impl/PortfolioServiceImpl.java | 46 ++++++++++---------
 1 file changed, 25 insertions(+), 21 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 e4a85177..239c5ac2 100644
--- a/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java
@@ -1131,28 +1131,32 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
         List<PortfolioTags> portfolioTags = portfolioTagsMapper.selectList(queryWrapper);
         List<Long> portfolioIdList = portfolioTags.stream().map(PortfolioTags::getPortfolioId).collect(Collectors.toList());
 
-        QueryWrapper<Portfolio> qw = new QueryWrapper<>();
-        qw.in("id", portfolioIdList);
-        Page<Portfolio> portfolioPage = baseMapper.selectPage(new Page<>(page, size), qw);
-//        List<Portfolio> portfolios = baseMapper.selectList(qw);
+        if (!portfolioIdList.isEmpty()){
+            QueryWrapper<Portfolio> qw = new QueryWrapper<>();
+            qw.in("id", portfolioIdList);
+            Page<Portfolio> portfolioPage = baseMapper.selectPage(new Page<>(page, size), qw);
 
-        // 将 Portfolio 转换为 PortfolioVO 并进行相关处理
-        IPage<PortfolioVO> convert = portfolioPage.convert((Function<Portfolio, PortfolioVO>) portfolio -> {
-            if (portfolio != null) {
-                PortfolioVO vo = CopyUtil.copyObject(portfolio, PortfolioVO.class);
-                Canvas canvas = canvasMapper.selectById(vo.getCanvasId());
-                vo.setCanvasUrl(minioUtil.getPreSignedUrl(canvas.getUrl(), 24 * 60));
-                vo.setLikeNum(redisUtil.getLikeCount(vo.getId()));
-                vo.setViewNums(redisUtil.getViewCount(vo.getId()));
-                Long accountId = vo.getAccountId();
-                vo.setUserName(accountMapper.selectById(accountId).getUserName());
-                if (vo.getOriginal() == 0) {
-                    vo.setOriginalUserName(accountMapper.selectById(vo.getOriginalAccountId()).getUserName());
+            // 将 Portfolio 转换为 PortfolioVO 并进行相关处理
+            IPage<PortfolioVO> convert = portfolioPage.convert((Function<Portfolio, PortfolioVO>) portfolio -> {
+                if (portfolio != null) {
+                    PortfolioVO vo = CopyUtil.copyObject(portfolio, PortfolioVO.class);
+                    Canvas canvas = canvasMapper.selectById(vo.getCanvasId());
+                    vo.setCanvasUrl(minioUtil.getPreSignedUrl(canvas.getUrl(), 24 * 60));
+                    vo.setLikeNum(redisUtil.getLikeCount(vo.getId()));
+                    vo.setViewNums(redisUtil.getViewCount(vo.getId()));
+                    Long accountId = vo.getAccountId();
+                    vo.setUserName(accountMapper.selectById(accountId).getUserName());
+                    if (vo.getOriginal() == 0) {
+                        vo.setOriginalUserName(accountMapper.selectById(vo.getOriginalAccountId()).getUserName());
+                    }
+                    return vo;
                 }
-                return vo;
-            }
-            return null;
-        });
-        return PageBaseResponse.success(convert);
+                return null;
+            });
+            return PageBaseResponse.success(convert);
+        }else {
+            return PageBaseResponse.success(new Page<>());
+        }
+
     }
 }