diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseQueryDto.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseQueryDto.java index 54aa0d7e..5829d723 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseQueryDto.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/dto/CourseQueryDto.java @@ -115,6 +115,11 @@ public class CourseQueryDto { */ private Boolean isSystemAdmin; + /** + * 是否是新建在线可 + */ + private Boolean isCreateCourse; + private Boolean visible; private String refId; diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java index e5aa9cf7..5cb5c879 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/service/impl/CourseServiceImpl.java @@ -414,27 +414,35 @@ public class CourseServiceImpl implements ICourseService { if (TempFilterConfig.Manager_CourseFile_ByOrgIds) { if (dto.getIsSystemAdmin() == null || !dto.getIsSystemAdmin()) { List finalStrings = strings; - - listByFilters2.removeIf(e -> { - //去掉未发布的课程 - if (!e.getPublished() && seache.contains(e.getId()) && !finalStrings.contains(e.getOrgId()) && !dto.getOrgAid().equals(e.getSysCreateAid())) { - return true; - } - //去掉所有条件都不符合的课程 - if(!seache.contains(e.getId())&&!dto.getReadIds().contains(e.getId())&& !finalStrings.contains(e.getOrgId()) && !dto.getOrgAid().equals(e.getSysCreateAid())){ - return true; - } - return false; - }); - //将需要隐藏的做标记 - listByFilters2.forEach(e -> { - if ((seache.contains(e.getId())||dto.getReadIds().contains(e.getOrgId())) && !finalStrings.contains(e.getOrgId()) && !dto.getOrgAid().equals(e.getSysCreateAid())) { - e.setIsPermission(false); - } else { - e.setIsPermission(true); - } - }); - listByFilters2.sort(Comparator.comparing(Course::getIsPermission).reversed()); + if(dto.getIsCreateCourse()){ + listByFilters2.removeIf(e -> { + //去掉未发布的课程 + if (!e.getPublished() && seache.contains(e.getId()) && !finalStrings.contains(e.getOrgId()) && !dto.getOrgAid().equals(e.getSysCreateAid())) { + return true; + } + //去掉所有条件都不符合的课程 + if(!seache.contains(e.getId())&&!dto.getReadIds().contains(e.getId())&& !finalStrings.contains(e.getOrgId()) && !dto.getOrgAid().equals(e.getSysCreateAid())){ + return true; + } + return false; + }); + //将需要隐藏的做标记 + listByFilters2.forEach(e -> { + if ((seache.contains(e.getId())||dto.getReadIds().contains(e.getOrgId())) && !finalStrings.contains(e.getOrgId()) && !dto.getOrgAid().equals(e.getSysCreateAid())) { + e.setIsPermission(false); + } else { + e.setIsPermission(true); + } + }); + listByFilters2.sort(Comparator.comparing(Course::getIsPermission).reversed()); + }else{ + List collect = listByFilters2.stream().filter(e ->dto.getReadIds().contains(e.getOrgId())||dto.getOrgAid().equals(e.getSysCreateAid())||finalStrings.contains(e.getOrgId())).collect(Collectors.toList()); + List paginate = paginate(collect, pageIndex, pageSize); + PageList rs = new PageList<>(); + rs.setCount(collect.size()); + rs.setList(paginate); + return rs; + } } } List paginate = paginate(listByFilters2, pageIndex, pageSize);