Commit 0f0f4e13 authored by liqin's avatar liqin 💬

bug fixed

parent fb4341f5
......@@ -399,6 +399,9 @@ public class ChinaMobileRestApiController extends BaseController {
LambdaQueryWrapper<Asset> assetQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, exhibitionBoard.getId());
assetQueryWrapper.eq(Asset::getFileCat, FileCatEnum.EXHIBITION_BOARD_AUDIO.name());
if (language != null) {
assetQueryWrapper.eq(Asset::getLanguage, language.name());
}
final List<Asset> audioList = this.assetService.list(assetQueryWrapper);
exhibitionBoard.setAudioList(audioList);
......@@ -416,6 +419,9 @@ public class ChinaMobileRestApiController extends BaseController {
assetQueryWrapper.clear();
assetQueryWrapper = Wrappers.<Asset>lambdaQuery().eq(Asset::getRefItemId, videoContentId);
assetQueryWrapper.eq(Asset::getFileCat, FileCatEnum.VIDEO_CONTENT.name());
if (language != null) {
assetQueryWrapper.eq(Asset::getLanguage, language.name());
}
final List<Asset> videoList = this.assetService.list(assetQueryWrapper);
exhibitionBoard.setVideoList(videoList);
}
......@@ -449,7 +455,8 @@ public class ChinaMobileRestApiController extends BaseController {
@PostMapping("/learningContent/getPage")
@RequiresPermissions("learning:content:page")
@ApiOperation(value = "查询学习内容", notes = "查询学习内容")
public Map<String, Object> getLearningContentPageList(GenericPageParam genericPageParam, @RequestParam(value = "learningProjectId", required = false) String learningProjectId) {
public Map<String, Object> getLearningContentPageList(GenericPageParam genericPageParam,
@RequestParam(value = "learningProjectId", required = false) String learningProjectId) {
LambdaQueryWrapper<LearningContent> queryWrapper = new LambdaQueryWrapper<>();
// 对名称或编码模糊查询
if (StringUtils.isNotBlank(learningProjectId)) {
......@@ -555,7 +562,8 @@ public class ChinaMobileRestApiController extends BaseController {
@PostMapping("/exhibitionBoard/search")
@RequiresPermissions("learning:content:board:page")
@ApiOperation(value = "模糊搜索查询", notes = "模糊搜索查询")
public Map<String, Object> getLearningContentBoardPageList(GenericPageParam genericPageParam, @RequestParam(value = "learningContentId", required = false) String learningContentId) {
public Map<String, Object> getLearningContentBoardPageList(GenericPageParam genericPageParam,
@RequestParam(value = "learningContentId", required = false) String learningContentId) {
IPage<ExhibitionBoard> page = this.learningContentBoardService.getBoardPageByLearningContentId(getPage(), learningContentId, genericPageParam.getNameOrCode());
return getResult(page);
}
......
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