Commit 07159043 authored by liqin's avatar liqin 💬

bug fixed

parent be56aaef
...@@ -70,6 +70,14 @@ public class LearningContentController extends BaseController { ...@@ -70,6 +70,14 @@ public class LearningContentController extends BaseController {
learningContent.setOrganId(orgId); learningContent.setOrganId(orgId);
learningContent.setAuditStatus(AuditStatusEnum.TBC.name()); learningContent.setAuditStatus(AuditStatusEnum.TBC.name());
learningContent.setIsPublished(false); learningContent.setIsPublished(false);
QueryWrapper<LearningContent> queryWrapper = new QueryWrapper<>();
queryWrapper.select("max(sortorder) as sortorder");
LearningContent content = this.learningContentService.getOne(queryWrapper);
if (content != null) {
learningContent.setSortorder(content.getSortorder() + 1);
} else {
learningContent.setSortorder(1);
}
// 保存业务节点信息 // 保存业务节点信息
boolean result = learningContentService.save(learningContent); boolean result = learningContentService.save(learningContent);
final String learningContentId = learningContent.getId(); final String learningContentId = learningContent.getId();
...@@ -89,9 +97,9 @@ public class LearningContentController extends BaseController { ...@@ -89,9 +97,9 @@ public class LearningContentController extends BaseController {
final List<String> exhibitionBoardIdList = learningContent.getExhibitionBoardIdList(); final List<String> exhibitionBoardIdList = learningContent.getExhibitionBoardIdList();
for (String exhibitionBoardId : exhibitionBoardIdList) { for (String exhibitionBoardId : exhibitionBoardIdList) {
LearningContentBoard learningContentBoard = LearningContentBoard.builder().exhibitionBoardId(exhibitionBoardId).learningContentId(learningContentId).build(); LearningContentBoard learningContentBoard = LearningContentBoard.builder().exhibitionBoardId(exhibitionBoardId).learningContentId(learningContentId).build();
QueryWrapper<LearningContentBoard> queryWrapper = new QueryWrapper<>(); QueryWrapper<LearningContentBoard> learningContentBoardQueryWrapper = new QueryWrapper<>();
queryWrapper.select("max(sortorder) as sortorder"); queryWrapper.select("max(sortorder) as sortorder");
LearningContentBoard one = this.learningContentBoardService.getOne(queryWrapper); LearningContentBoard one = this.learningContentBoardService.getOne(learningContentBoardQueryWrapper);
if (one != null) { if (one != null) {
learningContentBoard.setSortorder(one.getSortorder() + 1); learningContentBoard.setSortorder(one.getSortorder() + 1);
} else { } else {
...@@ -221,11 +229,11 @@ public class LearningContentController extends BaseController { ...@@ -221,11 +229,11 @@ public class LearningContentController extends BaseController {
LambdaQueryWrapper<LearningContent> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<LearningContent> queryWrapper = new LambdaQueryWrapper<>();
// 对名称或编码模糊查询 // 对名称或编码模糊查询
if (StringUtils.isNotBlank(learningProjectId)) { if (StringUtils.isNotBlank(learningProjectId)) {
queryWrapper.like(LearningContent::getLearningProjectId, learningProjectId); queryWrapper.eq(LearningContent::getLearningProjectId, learningProjectId);
} }
// 根据创建时间区间检索 // 根据创建时间区间检索
if (genericPageParam.getIsPublished() != null) { if (genericPageParam.getIsPublished() != null) {
queryWrapper.like(LearningContent::getIsPublished, genericPageParam.getIsPublished()); queryWrapper.eq(LearningContent::getIsPublished, genericPageParam.getIsPublished());
} }
// 对名称或编码模糊查询 // 对名称或编码模糊查询
if (StringUtils.isNotBlank(genericPageParam.getNameOrCode())) { if (StringUtils.isNotBlank(genericPageParam.getNameOrCode())) {
......
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