|
@@ -199,9 +199,9 @@ public class AlbumYelpServiceImpl extends SuperServiceImpl<AlbumYelpMapper, Albu
|
|
|
AlbumYelp albumYelpParent = albumYelpMapper.selectById(albumYelp.getYelpId());
|
|
|
AlbumYelpInfoVo albumYelpInfoVoParent = new AlbumYelpInfoVo();
|
|
|
albumYelpInfoVoParent.setCreateName(userService.queryOsUserDto(albumYelpParent.getCreateBy()).getFullName());
|
|
|
- albumYelpInfoVo.setCreatePhoto((String) userService.querySexAndPhoto(albumYelpParent.getCreateBy()).get("photo"));
|
|
|
- albumYelpInfoVo.setContent(albumYelpParent.getContent());
|
|
|
- albumYelpInfoVo.setCreateTime(albumYelpParent.getCreateTime());
|
|
|
+ albumYelpInfoVoParent.setCreatePhoto((String) userService.querySexAndPhoto(albumYelpParent.getCreateBy()).get("photo"));
|
|
|
+ albumYelpInfoVoParent.setContent(albumYelpParent.getContent());
|
|
|
+ albumYelpInfoVoParent.setCreateTime(albumYelpParent.getCreateTime());
|
|
|
albumYelpInfoVo.setAlbumYelpInfoVo(albumYelpInfoVoParent);
|
|
|
}
|
|
|
//专辑信息
|
|
@@ -227,7 +227,7 @@ public class AlbumYelpServiceImpl extends SuperServiceImpl<AlbumYelpMapper, Albu
|
|
|
albumInfoDetailVo.setStateName(AlbumInfoEnum.getMessage(albumInfo.getState()));
|
|
|
//版本状态名称
|
|
|
QueryWrapper<AlbumVersion> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.eq("ALBUM_ID", pkId);
|
|
|
+ queryWrapper.eq("ALBUM_ID", albumYelp.getAlbumId());
|
|
|
queryWrapper.orderByDesc("CREATE_TIME_");
|
|
|
List<AlbumVersion> albumVersions = albumVersionMapper.selectList(queryWrapper);
|
|
|
//最新版本状态
|
|
@@ -241,8 +241,8 @@ public class AlbumYelpServiceImpl extends SuperServiceImpl<AlbumYelpMapper, Albu
|
|
|
albumYelpInfoVo.setAlbumInfoDetailVo(albumInfoDetailVo);
|
|
|
//审核流程
|
|
|
QueryWrapper<AlbumYelpApprove> queryWrapperApprove = new QueryWrapper<>();
|
|
|
- queryWrapper.eq("YELP_ID", pkId);
|
|
|
- queryWrapper.orderByAsc("SORT");
|
|
|
+ queryWrapperApprove.eq("YELP_ID", pkId);
|
|
|
+ queryWrapperApprove.orderByAsc("SORT");
|
|
|
List<AlbumYelpApprove> albumApproveList = albumYelpApproveService.findAll(queryWrapperApprove);
|
|
|
List<AlbumApproveVo> albumApproveVoList = new ArrayList<>();
|
|
|
boolean flag = true;
|