diff --git a/src/main/java/com/ai/da/controller/SavedCollectionController.java b/src/main/java/com/ai/da/controller/SavedCollectionController.java index f5147a7c..228646dc 100644 --- a/src/main/java/com/ai/da/controller/SavedCollectionController.java +++ b/src/main/java/com/ai/da/controller/SavedCollectionController.java @@ -126,7 +126,11 @@ public class SavedCollectionController { userLikeGroupVO.setSketchCount(CollectionUtils.isEmpty(details) ? 0 : details.size()); if (userLikeGroupVO.getOriginal() == 0) { userLikeGroupVO.setOriginalAccountName(accountService.getById(userLikeGroupVO.getOriginalAccountId()).getUserName()); - userLikeGroupVO.setOriginalPortfolioName(portfolioService.getById(userLikeGroupVO.getOriginalPortfolioId()).getPortfolioName()); + Portfolio byId = portfolioService.getByIdAll(userLikeGroupVO.getOriginalPortfolioId()); + if (Objects.nonNull(byId)) { + String portfolioName = byId.getPortfolioName(); + userLikeGroupVO.setOriginalPortfolioName(portfolioName); + } } return userLikeGroupVO; } diff --git a/src/main/java/com/ai/da/mapper/primary/PortfolioMapper.java b/src/main/java/com/ai/da/mapper/primary/PortfolioMapper.java index 54ef023b..f1ebf39b 100644 --- a/src/main/java/com/ai/da/mapper/primary/PortfolioMapper.java +++ b/src/main/java/com/ai/da/mapper/primary/PortfolioMapper.java @@ -4,4 +4,5 @@ import com.ai.da.common.config.mybatis.plus.CommonMapper; import com.ai.da.mapper.primary.entity.Portfolio; public interface PortfolioMapper extends CommonMapper { + Portfolio getByIdAll(Long originalPortfolioId); } diff --git a/src/main/java/com/ai/da/model/vo/PortfolioVO.java b/src/main/java/com/ai/da/model/vo/PortfolioVO.java index 6ccc2352..c7c0a088 100644 --- a/src/main/java/com/ai/da/model/vo/PortfolioVO.java +++ b/src/main/java/com/ai/da/model/vo/PortfolioVO.java @@ -26,4 +26,6 @@ public class PortfolioVO extends Portfolio { private Integer isMine; private Integer selected; + + private Integer jumpable; } diff --git a/src/main/java/com/ai/da/service/PortfolioService.java b/src/main/java/com/ai/da/service/PortfolioService.java index 86191a69..b809857c 100644 --- a/src/main/java/com/ai/da/service/PortfolioService.java +++ b/src/main/java/com/ai/da/service/PortfolioService.java @@ -39,4 +39,6 @@ public interface PortfolioService extends IService { Boolean commentDelete(CommentDTO commentDTO); Boolean delete(Long id); + + Portfolio getByIdAll(Long originalPortfolioId); } 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 e4671df3..ee0cd4ef 100644 --- a/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java @@ -492,7 +492,16 @@ public class PortfolioServiceImpl extends ServiceImpl getChildCommentVOList(Long id) { QueryWrapper qw = new QueryWrapper<>(); qw.lambda().eq(Comment::getParentLevel1Id, id); diff --git a/src/main/resources/mapper/primary/PortfolioMapper.xml b/src/main/resources/mapper/primary/PortfolioMapper.xml new file mode 100644 index 00000000..f6c9eeac --- /dev/null +++ b/src/main/resources/mapper/primary/PortfolioMapper.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/target/classes/mapper/AccountMapper.xml b/target/classes/mapper/AccountMapper.xml deleted file mode 100644 index 2e2bd6b6..00000000 --- a/target/classes/mapper/AccountMapper.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - -