Commit 5e817da3 authored by liqin's avatar liqin 💬

bug fixed

parent f8a67011
...@@ -24,6 +24,7 @@ import org.springframework.validation.annotation.Validated; ...@@ -24,6 +24,7 @@ import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -236,6 +237,17 @@ public class ExhibitionBoardController extends BaseController { ...@@ -236,6 +237,17 @@ public class ExhibitionBoardController extends BaseController {
exhibitionBoard.setExhibitionBoardCatName(exhibitionBoardCat.getName()); exhibitionBoard.setExhibitionBoardCatName(exhibitionBoardCat.getName());
} }
} }
if (exhibitionBoard.getVideoContentId() != null) {
String videoContentId = exhibitionBoard.getVideoContentId();
final VideoContent videoContent = this.videoContentService.getById(videoContentId);
if (videoContent == null) {
exhibitionBoard.setVideoList(Collections.emptyList());
} else {
exhibitionBoard.setVideoContentName(videoContent.getName());
final List<Asset> videoList = this.assetService.list(Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, videoContentId));
exhibitionBoard.setVideoList(videoList);
}
}
} }
return getResult(exhibitionBoardList); return getResult(exhibitionBoardList);
} }
...@@ -321,7 +333,7 @@ public class ExhibitionBoardController extends BaseController { ...@@ -321,7 +333,7 @@ public class ExhibitionBoardController extends BaseController {
exhibitionBoard.setVideoContentName("对应的视频内容已被删除"); exhibitionBoard.setVideoContentName("对应的视频内容已被删除");
} else { } else {
exhibitionBoard.setVideoContentName(videoContent.getName()); exhibitionBoard.setVideoContentName(videoContent.getName());
final List<Asset> videoList = this.assetService.list(Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, videoContentId).eq(Asset::getFileCat, FileCatEnum.VIDEO_CONTENT.name())); final List<Asset> videoList = this.assetService.list(Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, videoContentId));
exhibitionBoard.setVideoList(videoList); exhibitionBoard.setVideoList(videoList);
} }
} }
......
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