aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUGFIX:aida;

Browse Source
This commit is contained in:
shahaibo
2024-07-08 16:17:13 +08:00
parent 9ca0cd7c43
commit 42f1d47f82
7 changed files with 37 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/ai/da/controller/SavedCollectionController.java
View File

@@ -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;
}

1
src/main/java/com/ai/da/mapper/primary/PortfolioMapper.java
View File

@@ -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> {
Portfolio getByIdAll(Long originalPortfolioId);
}

2
src/main/java/com/ai/da/model/vo/PortfolioVO.java
View File

@@ -26,4 +26,6 @@ public class PortfolioVO extends Portfolio {
private Integer isMine;
private Integer selected;
private Integer jumpable;
}

2
src/main/java/com/ai/da/service/PortfolioService.java
View File

@@ -39,4 +39,6 @@ public interface PortfolioService extends IService<Portfolio> {
Boolean commentDelete(CommentDTO commentDTO);
Boolean delete(Long id);
Portfolio getByIdAll(Long originalPortfolioId);
}

16
src/main/java/com/ai/da/service/impl/PortfolioServiceImpl.java
View File

@@ -492,7 +492,16 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
vo.setUserName(accountMapper.selectById(vo.getAccountId()).getUserName());
if (vo.getOriginal() == 0) {
vo.setOriginalUserName(accountMapper.selectById(vo.getOriginalAccountId()).getUserName());
vo.setOriginalPortfolioName(portfolioMapper.selectById(vo.getOriginalPortfolioId()).getPortfolioName());
Portfolio byId = portfolioMapper.getByIdAll(vo.getOriginalPortfolioId());
if (Objects.nonNull(byId)) {
String portfolioName = byId.getPortfolioName();
vo.setOriginalPortfolioName(portfolioName);
if (byId.getIsDeleted() == 0) {
vo.setJumpable(1);
}else {
vo.setJumpable(0);
}
}
}
if (userHolder == null) {
vo.setIsMine(0);
@@ -882,6 +891,11 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
return Boolean.TRUE;
}
@Override
public Portfolio getByIdAll(Long originalPortfolioId) {
return portfolioMapper.getByIdAll(originalPortfolioId);
}
private List<CommentVO> getChildCommentVOList(Long id) {
QueryWrapper<Comment> qw = new QueryWrapper<>();
qw.lambda().eq(Comment::getParentLevel1Id, id);