Commit dd32683c authored by nie'hong's avatar nie'hong

修改—删除展板时提示哪些学习内容在使用展板,修改内容时不显示已下架展板

parent 079c85f6
......@@ -256,6 +256,7 @@ public class ExhibitionBoardController extends BaseController {
// 查询在指定展板分类下的展板信息
LambdaQueryWrapper<ExhibitionBoard> lambdaQuery = Wrappers.<ExhibitionBoard>lambdaQuery();
lambdaQuery.eq(ExhibitionBoard::getPublished, true);
lambdaQuery.in(ExhibitionBoard::getExhibitionBoardCatId, boardCatIds);
lambdaQuery.in(ExhibitionBoard::getId, boardId);
List<ExhibitionBoard> exhibitionBoardList = exhibitionBoardService.list(lambdaQuery);
......@@ -615,9 +616,11 @@ public class ExhibitionBoardController extends BaseController {
// 查询展板对应的学习内容id
queryWrapper.eq(LearningContentBoard::getExhibitionBoardId, id);
queryWrapper.select(LearningContentBoard::getLearningContentId);
List<String> list = this.learningContentBoardService.listObjs(queryWrapper,Object::toString);
List<String> list = this.learningContentBoardService.listObjs(queryWrapper, Object::toString);
List<LearningContent> learningContents = this.learningContentService.listByIds(list);
String collect = learningContents.stream().map(LearningContent::getName).collect(Collectors.joining(","));
if (CollectionUtil.isNotEmpty(list)) {
return getFailResult("该展板被学习内容使用,不能被删除!");
return getFailResult("该展板被学习内容:" + collect + "使用,不能被删除!");
}
TUser user = getcurUser();
......
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