diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CoursePageServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CoursePageServiceImpl.java index ea06729c..96f0205b 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CoursePageServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CoursePageServiceImpl.java @@ -87,6 +87,36 @@ public class CoursePageServiceImpl implements ICoursePageService { long total = courseDao.countCourse(coursePageQueryDTO, isSystemAdmin, orgIds, currentAccountId, mySqlSchemaProperties.getUserCenterSchema()); List voList = courseDao.queryCourse(coursePageQueryDTO, isSystemAdmin, orgIds, currentAccountId, true, mySqlSchemaProperties.getUserCenterSchema()); + // 整理数据 + if (voList != null && !voList.isEmpty()) { + for (CoursePageVo vo : voList) { + // status为null的给默认值 + if (vo.getStatus() == null) { + vo.setStatus(Course.STATUS_NONE); + } + // createFrom为空的 + if (StringUtils.isBlank(vo.getCreateFrom())) { + vo.setCreateFrom(CourseCreateFromEnum.ADMIN.getCode()); + } + // openCourse + if (vo.getOpenCourse() == null) { + vo.setOpenCourse(0); + } + // published + if (vo.getPublished() == null) { + vo.setPublished(false); + } + // enabled + if (vo.getEnabled() == null) { + vo.setEnabled(true); + } + // isTop + if (vo.getIsTop() == null) { + vo.setIsTop(false); + } + } + } + PageList result = new PageList<>(); result.setCount((int) total); result.setPageSize(coursePageQueryDTO.getPageSize());