bug fixed

src/main/java/cn/chnmuseum/party/web/controller/ExhibitionBoardController.java

@@ -392,23 +392,18 @@ public class ExhibitionBoardController extends BaseController {
             exhibitionBoard.setVideoContentCopyrightOwnerName(name);
         }
 
-        LambdaQueryWrapper<Asset> assetQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, exhibitionBoard.getId());
-        assetQueryWrapper.eq(Asset::getPublished, false);
-        assetQueryWrapper.eq(Asset::getFileCat, FileCatEnum.EXHIBITION_BOARD_AUDIO.name());
-        final List<Asset> audioList = this.assetService.list(assetQueryWrapper);
-        if (audioList != null && !audioList.isEmpty()) {
+        final List<String> audioIdList = exhibitionBoard.getAudioIdList();
+        if (audioIdList != null && !audioIdList.isEmpty()) {
+            final List<Asset> audioList = this.assetService.listByIds(audioIdList);
+            exhibitionBoard.setAudioIdList(audioIdList);
             exhibitionBoard.setAudioList(audioList);
-            exhibitionBoard.setAudioIdList(audioList.stream().map(Asset::getId).collect(Collectors.toList()));
         }
 
-        assetQueryWrapper.clear();
-        assetQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, exhibitionBoard.getId());
-        assetQueryWrapper.eq(Asset::getPublished, false);
-        assetQueryWrapper.eq(Asset::getFileCat, FileCatEnum.EXHIBITION_BOARD_DATUM.name());
-        final List<Asset> datumList = this.assetService.list(assetQueryWrapper);
-        if (datumList != null && !datumList.isEmpty()) {
+        final List<String> datumIdList = exhibitionBoard.getDatumIdList();
+        if (datumIdList != null && !datumIdList.isEmpty()) {
+            final List<Asset> datumList = this.assetService.listByIds(datumIdList);
+            exhibitionBoard.setDatumIdList(datumIdList);
             exhibitionBoard.setDatumList(datumList);
-            exhibitionBoard.setDatumIdList(datumList.stream().map(Asset::getId).collect(Collectors.toList()));
         }
 
         final LambdaQueryWrapper<Audit> auditQueryWrapper = Wrappers.<Audit>lambdaQuery().eq(Audit::getRefItemId, exhibitionBoard.getId());
@@ -425,7 +420,7 @@ public class ExhibitionBoardController extends BaseController {
             }
             final LambdaQueryWrapper<Asset> lambdaQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, videoContentId);
             lambdaQueryWrapper.eq(Asset::getFileCat, FileCatEnum.VIDEO_CONTENT.name());
-            assetQueryWrapper.eq(Asset::getPublished, false);
+            lambdaQueryWrapper.eq(Asset::getPublished, true);
             final List<Asset> videoList = this.assetService.list(lambdaQueryWrapper);
             exhibitionBoard.setVideoList(videoList);
         }

src/main/java/cn/chnmuseum/party/web/controller/VideoContentController.java

@@ -324,12 +324,11 @@ public class VideoContentController extends BaseController {
                 videoContent.setVideoContentCopyrightOwnerName(copyrightOwner.getName());
             }
         }
-        final LambdaQueryWrapper<Asset> assetQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, id);
-        assetQueryWrapper.eq(Asset::getPublished, false);
-        assetQueryWrapper.eq(Asset::getFileCat, FileCatEnum.VIDEO_CONTENT.name());
-        final List<Asset> videoFileList = this.assetService.list(assetQueryWrapper);
+
+        final List<String> videoFileIdList = videoContent.getVideoFileIdList();
+        final List<Asset> videoFileList = this.assetService.listByIds(videoFileIdList);
+        videoContent.setVideoFileIdList(videoFileIdList);
         videoContent.setVideoFileList(videoFileList);
-        videoContent.setVideoFileIdList(videoFileList.stream().map(Asset::getId).collect(Collectors.toList()));
 
         final LambdaQueryWrapper<Audit> auditQueryWrapper = Wrappers.<Audit>lambdaQuery().eq(Audit::getRefItemId, id);
         final List<Audit> auditList = this.auditService.list(auditQueryWrapper);