From 3159208a0aff31ae7ea9983514adbd1bd275b766 Mon Sep 17 00:00:00 2001 From: shahaibo <1023316923@qq.com> Date: Tue, 18 Mar 2025 16:54:21 +0800 Subject: [PATCH] =?UTF-8?q?TASK:AiDA=E6=A8=A1=E5=9D=97=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/UserLikeGroupServiceImpl.java | 42 ++++++++++--------- .../mapper/primary/UserLikeGroupMapper.xml | 3 +- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java index a6567ef0..5a111321 100644 --- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java @@ -1205,29 +1205,31 @@ public class UserLikeGroupServiceImpl extends ServiceImpl userLikeGroupQueryWrapper1 = new QueryWrapper<>(); userLikeGroupQueryWrapper1.lambda().eq(UserLikeGroup::getProjectId, projectVO.getId()); UserLikeGroup userLikeGroup = userLikeGroupMapper.selectOne(userLikeGroupQueryWrapper1); - UserLikeGroupVO userLikeGroupVO = CopyUtil.copyObject(userLikeGroup, UserLikeGroupVO.class); - userLikeGroupVO.setAuthor(account.getUserName()); - //count 和detail - if (groupDetailMap.keySet().contains(userLikeGroupVO.getId())) { - List details = groupDetailMap.get(userLikeGroupVO.getId()); - for (UserLikeVO detail : details) { - TDesignPythonOutfit tDesignPythonOutfit = designPythonOutfitMapper.selectById(detail.getDesignOutfitId()); - detail.setUrl(minioUtil.getPreSignedUrl(tDesignPythonOutfit.getDesignUrl(), 24 * 60)); + if (Objects.nonNull(userLikeGroup)) { + UserLikeGroupVO userLikeGroupVO = CopyUtil.copyObject(userLikeGroup, UserLikeGroupVO.class); + userLikeGroupVO.setAuthor(account.getUserName()); + //count 和detail + if (groupDetailMap.keySet().contains(userLikeGroupVO.getId())) { + List details = groupDetailMap.get(userLikeGroupVO.getId()); + for (UserLikeVO detail : details) { + TDesignPythonOutfit tDesignPythonOutfit = designPythonOutfitMapper.selectById(detail.getDesignOutfitId()); + detail.setUrl(minioUtil.getPreSignedUrl(tDesignPythonOutfit.getDesignUrl(), 24 * 60)); + } + userLikeGroupVO.setGroupDetails(details); + userLikeGroupVO.setSketchCount(CollectionUtils.isEmpty(details) ? 0 : details.size()); + }else { + userLikeGroupVO.setSketchCount(0); } - userLikeGroupVO.setGroupDetails(details); - userLikeGroupVO.setSketchCount(CollectionUtils.isEmpty(details) ? 0 : details.size()); - }else { - userLikeGroupVO.setSketchCount(0); - } - if (userLikeGroupVO.getOriginal() == 0) { - userLikeGroupVO.setOriginalAccountName(accountService.getById(userLikeGroupVO.getOriginalAccountId()).getUserName()); - Portfolio byId = portfolioService.getByIdAll(userLikeGroupVO.getOriginalPortfolioId()); - if (Objects.nonNull(byId)) { - String portfolioName = byId.getPortfolioName(); - userLikeGroupVO.setOriginalPortfolioName(portfolioName); + if (userLikeGroupVO.getOriginal() == 0) { + userLikeGroupVO.setOriginalAccountName(accountService.getById(userLikeGroupVO.getOriginalAccountId()).getUserName()); + Portfolio byId = portfolioService.getByIdAll(userLikeGroupVO.getOriginalPortfolioId()); + if (Objects.nonNull(byId)) { + String portfolioName = byId.getPortfolioName(); + userLikeGroupVO.setOriginalPortfolioName(portfolioName); + } } + projectVO.setUserLikeGroupVO(userLikeGroupVO); } - projectVO.setUserLikeGroupVO(userLikeGroupVO); return projectVO; } return null; diff --git a/src/main/resources/mapper/primary/UserLikeGroupMapper.xml b/src/main/resources/mapper/primary/UserLikeGroupMapper.xml index 9babfe9a..ba483f8b 100644 --- a/src/main/resources/mapper/primary/UserLikeGroupMapper.xml +++ b/src/main/resources/mapper/primary/UserLikeGroupMapper.xml @@ -30,8 +30,7 @@ JOIN t_user_like_group ulg ON ul.user_like_group_id = ulg.id WHERE ulg.account_id != -1 GROUP BY d.account_id - having count(*) >= 200 ORDER BY COUNT(*) DESC - limit 10; + ;