|
|
@@ -755,6 +755,7 @@ public class LifeUserViolationServiceImpl extends ServiceImpl<LifeUserViolationM
|
|
|
return resultPage.convert(e -> {
|
|
|
LifeUserViolationDto dto = new LifeUserViolationDto();
|
|
|
BeanUtils.copyProperties(e, dto);
|
|
|
+ dto.setNickname(e.getNickName());
|
|
|
return dto;
|
|
|
});
|
|
|
}
|
|
|
@@ -769,7 +770,7 @@ public class LifeUserViolationServiceImpl extends ServiceImpl<LifeUserViolationM
|
|
|
List<String> videoFileType = Arrays.asList("mp4", "avi", "mov", "wmv", "flv", "mkv");
|
|
|
|
|
|
if ("2".equals(item.getReportContextType())) {
|
|
|
- LifeUserDynamics dynamicsInfo = lifeUserDynamicsMapper.selectById(id);
|
|
|
+ LifeUserDynamics dynamicsInfo = lifeUserDynamicsMapper.selectById(item.getDynamicsId());
|
|
|
item.setDynamicsInfo(dynamicsInfo);
|
|
|
// 将逗号分隔的图片路径拆分成 List<String>
|
|
|
if (dynamicsInfo != null && StringUtils.isNotEmpty(dynamicsInfo.getImagePath())) {
|
|
|
@@ -783,15 +784,18 @@ public class LifeUserViolationServiceImpl extends ServiceImpl<LifeUserViolationM
|
|
|
|
|
|
if ("3".equals(item.getReportContextType())) {
|
|
|
// TODO: 处理评论类型
|
|
|
- LifeComment commentInfo = lifeCommentMapper.selectById(id);
|
|
|
+ StoreComment commentInfo = storeCommentMapper.selectById(item.getBusinessId());
|
|
|
item.setCommentInfo(commentInfo);
|
|
|
+
|
|
|
+ LifeUserDynamics dynamicsInfo = lifeUserDynamicsMapper.selectById(commentInfo.getBusinessId());
|
|
|
+ item.setDynamicsInfo(dynamicsInfo);
|
|
|
// 将逗号分隔的图片路径拆分成 List<String>
|
|
|
- if (commentInfo != null && StringUtils.isNotEmpty(commentInfo.getImagePath())) {
|
|
|
- List<String> imagePathList = Arrays.stream(commentInfo.getImagePath().split(","))
|
|
|
+ if (dynamicsInfo != null && StringUtils.isNotEmpty(dynamicsInfo.getImagePath())) {
|
|
|
+ List<String> imagePathList = Arrays.stream(dynamicsInfo.getImagePath().split(","))
|
|
|
.map(String::trim)
|
|
|
.filter(StringUtils::isNotEmpty)
|
|
|
.collect(Collectors.toList());
|
|
|
- item.setCommentImg(imagePathList);
|
|
|
+ item.setDynamicsImg(imagePathList);
|
|
|
}
|
|
|
}
|
|
|
|