|
@@ -1132,12 +1132,13 @@ public class PageServiceImpl implements PageService {
|
|
for (int i = 0; i < imageArchiveList.size(); i++) {
|
|
for (int i = 0; i < imageArchiveList.size(); i++) {
|
|
ArchiveContentVo imageArchive = imageArchiveList.get(i);
|
|
ArchiveContentVo imageArchive = imageArchiveList.get(i);
|
|
List<String> imageList = pageMapper.getArchiveImageList(imageArchive.getArchiveContentId());
|
|
List<String> imageList = pageMapper.getArchiveImageList(imageArchive.getArchiveContentId());
|
|
|
|
+ imageArchive.setImageNum(imageList.size());
|
|
if (0 == finalPermission) {
|
|
if (0 == finalPermission) {
|
|
imageArchive.setImageList(imageList);
|
|
imageArchive.setImageList(imageList);
|
|
- } else if (2 == productClassify && i < 2) {
|
|
|
|
|
|
+ } else if (2 == productClassify && imageArchive.getImageNum() >= 5) {
|
|
imageArchive.setImageList(imageList.subList(0,2));
|
|
imageArchive.setImageList(imageList.subList(0,2));
|
|
}
|
|
}
|
|
- imageArchive.setImageNum(imageList.size());
|
|
|
|
|
|
+
|
|
}
|
|
}
|
|
videoArchiveList.forEach(videoArchive -> {
|
|
videoArchiveList.forEach(videoArchive -> {
|
|
ArchiveFilePo archiveFile = pageMapper.getArchiveFile(videoArchive.getArchiveContentId());
|
|
ArchiveFilePo archiveFile = pageMapper.getArchiveFile(videoArchive.getArchiveContentId());
|