fix:9.11代码覆盖恢复
This commit is contained in:
@@ -538,7 +538,7 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
|
||||
|
||||
@Override
|
||||
public PortfolioVO detail(PortfolioDTO portfolioDTO) {
|
||||
AuthPrincipalVo userHolder = UserContext.getUserHolder();
|
||||
// AuthPrincipalVo userHolder = UserContext.getUserHolder();
|
||||
Portfolio portfolio = portfolioMapper.selectById(portfolioDTO.getId());
|
||||
PortfolioVO vo = CopyUtil.copyObject(portfolio, PortfolioVO.class);
|
||||
if (vo.getOpenSource() == 1) {
|
||||
@@ -553,7 +553,7 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
|
||||
}
|
||||
vo.setCollectionElementList(collectionElementList);
|
||||
List<UserLikeSnapshot> userLikeList = projectSnapshot.getUserLikeList();
|
||||
if (userLikeList != null && !userLikeList.isEmpty()) {
|
||||
if (userLikeList != null && !userLikeList.isEmpty()){
|
||||
List<TDesignPythonOutfit> list = new ArrayList<>();
|
||||
for (UserLikeSnapshot userLikeSnapshot : userLikeList) {
|
||||
TDesignPythonOutfit designPythonOutfit = userLikeSnapshot.getDesignPythonOutfit();
|
||||
@@ -569,19 +569,19 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
|
||||
vo.setLikeNum(redisUtil.getLikeCount(vo.getId()));
|
||||
String avatar;
|
||||
Account account = accountMapper.selectById(vo.getAccountId());
|
||||
if (userHolder == null) {
|
||||
if (Objects.isNull(portfolioDTO.getAccountId())) {
|
||||
vo.setIsLike(0);
|
||||
vo.setIsFollow(0);
|
||||
avatar = CommonConstant.DEFAULT_AVATAR;
|
||||
} else {
|
||||
boolean postLikedByUser = redisUtil.isPostLikedByUser(portfolioDTO.getId(), userHolder.getId());
|
||||
boolean postLikedByUser = redisUtil.isPostLikedByUser(portfolioDTO.getId(), portfolioDTO.getAccountId());
|
||||
if (postLikedByUser) {
|
||||
vo.setIsLike(1);
|
||||
} else {
|
||||
vo.setIsLike(0);
|
||||
}
|
||||
// 设置当前用户是否关注了所查看作品的作者
|
||||
Integer ifFollowed = getIfFollowed(portfolio.getAccountId(), userHolder.getId());
|
||||
Integer ifFollowed = getIfFollowed(portfolio.getAccountId(), portfolioDTO.getAccountId());
|
||||
vo.setIsFollow(ifFollowed);
|
||||
avatar = StringUtil.isNullOrEmpty(account.getAvatar()) ? CommonConstant.DEFAULT_AVATAR : account.getAvatar();
|
||||
}
|
||||
@@ -602,17 +602,17 @@ public class PortfolioServiceImpl extends ServiceImpl<PortfolioMapper, Portfolio
|
||||
}
|
||||
}
|
||||
}
|
||||
if (userHolder == null) {
|
||||
if (Objects.isNull(portfolioDTO.getAccountId())) {
|
||||
vo.setIsMine(0);
|
||||
vo.setSelected(0);
|
||||
} else {
|
||||
if (Objects.equals(vo.getAccountId(), userHolder.getId()) || Objects.equals(vo.getOriginalAccountId(), userHolder.getId())) {
|
||||
if (Objects.equals(vo.getAccountId(), portfolioDTO.getAccountId()) || Objects.equals(vo.getOriginalAccountId(), portfolioDTO.getAccountId())) {
|
||||
vo.setIsMine(1);
|
||||
vo.setSelected(1);
|
||||
} else {
|
||||
vo.setIsMine(0);
|
||||
QueryWrapper<UserLikeGroup> getSelectedQw = new QueryWrapper<>();
|
||||
getSelectedQw.lambda().eq(UserLikeGroup::getAccountId, userHolder.getId());
|
||||
getSelectedQw.lambda().eq(UserLikeGroup::getAccountId, portfolioDTO.getAccountId());
|
||||
getSelectedQw.lambda().eq(UserLikeGroup::getOriginalPortfolioId, vo.getId());
|
||||
List<UserLikeGroup> userLikeGroups = userLikeGroupMapper.selectList(getSelectedQw);
|
||||
if (CollectionUtils.isEmpty(userLikeGroups)) {
|
||||
|
||||
Reference in New Issue
Block a user