Commit c026d943 authored by liqin's avatar liqin 💬

bug fixed

parent 839912e5
...@@ -392,23 +392,18 @@ public class ExhibitionBoardController extends BaseController { ...@@ -392,23 +392,18 @@ public class ExhibitionBoardController extends BaseController {
exhibitionBoard.setVideoContentCopyrightOwnerName(name); exhibitionBoard.setVideoContentCopyrightOwnerName(name);
} }
LambdaQueryWrapper<Asset> assetQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, exhibitionBoard.getId()); final List<String> audioIdList = exhibitionBoard.getAudioIdList();
assetQueryWrapper.eq(Asset::getPublished, false); if (audioIdList != null && !audioIdList.isEmpty()) {
assetQueryWrapper.eq(Asset::getFileCat, FileCatEnum.EXHIBITION_BOARD_AUDIO.name()); final List<Asset> audioList = this.assetService.listByIds(audioIdList);
final List<Asset> audioList = this.assetService.list(assetQueryWrapper); exhibitionBoard.setAudioIdList(audioIdList);
if (audioList != null && !audioList.isEmpty()) {
exhibitionBoard.setAudioList(audioList); exhibitionBoard.setAudioList(audioList);
exhibitionBoard.setAudioIdList(audioList.stream().map(Asset::getId).collect(Collectors.toList()));
} }
assetQueryWrapper.clear(); final List<String> datumIdList = exhibitionBoard.getDatumIdList();
assetQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, exhibitionBoard.getId()); if (datumIdList != null && !datumIdList.isEmpty()) {
assetQueryWrapper.eq(Asset::getPublished, false); final List<Asset> datumList = this.assetService.listByIds(datumIdList);
assetQueryWrapper.eq(Asset::getFileCat, FileCatEnum.EXHIBITION_BOARD_DATUM.name()); exhibitionBoard.setDatumIdList(datumIdList);
final List<Asset> datumList = this.assetService.list(assetQueryWrapper);
if (datumList != null && !datumList.isEmpty()) {
exhibitionBoard.setDatumList(datumList); 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()); final LambdaQueryWrapper<Audit> auditQueryWrapper = Wrappers.<Audit>lambdaQuery().eq(Audit::getRefItemId, exhibitionBoard.getId());
...@@ -425,7 +420,7 @@ public class ExhibitionBoardController extends BaseController { ...@@ -425,7 +420,7 @@ public class ExhibitionBoardController extends BaseController {
} }
final LambdaQueryWrapper<Asset> lambdaQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, videoContentId); final LambdaQueryWrapper<Asset> lambdaQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, videoContentId);
lambdaQueryWrapper.eq(Asset::getFileCat, FileCatEnum.VIDEO_CONTENT.name()); 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); final List<Asset> videoList = this.assetService.list(lambdaQueryWrapper);
exhibitionBoard.setVideoList(videoList); exhibitionBoard.setVideoList(videoList);
} }
......
...@@ -324,12 +324,11 @@ public class VideoContentController extends BaseController { ...@@ -324,12 +324,11 @@ public class VideoContentController extends BaseController {
videoContent.setVideoContentCopyrightOwnerName(copyrightOwner.getName()); videoContent.setVideoContentCopyrightOwnerName(copyrightOwner.getName());
} }
} }
final LambdaQueryWrapper<Asset> assetQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, id);
assetQueryWrapper.eq(Asset::getPublished, false); final List<String> videoFileIdList = videoContent.getVideoFileIdList();
assetQueryWrapper.eq(Asset::getFileCat, FileCatEnum.VIDEO_CONTENT.name()); final List<Asset> videoFileList = this.assetService.listByIds(videoFileIdList);
final List<Asset> videoFileList = this.assetService.list(assetQueryWrapper); videoContent.setVideoFileIdList(videoFileIdList);
videoContent.setVideoFileList(videoFileList); 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 LambdaQueryWrapper<Audit> auditQueryWrapper = Wrappers.<Audit>lambdaQuery().eq(Audit::getRefItemId, id);
final List<Audit> auditList = this.auditService.list(auditQueryWrapper); final List<Audit> auditList = this.auditService.list(auditQueryWrapper);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment