From 407c7693bbaab46ae3138248043b2106a602ba43 Mon Sep 17 00:00:00 2001
From: xiaozhequ <792962424@qq.com>
Date: Thu, 4 Jul 2024 16:21:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=88=86=E6=96=B0=E5=BB=BA=E8=AF=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/course/dto/CourseQueryDto.java     |  5 ++
 .../service/impl/CourseServiceImpl.java       | 50 +++++++++++--------
 2 files changed, 34 insertions(+), 21 deletions(-)

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<String> 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<Course> collect = listByFilters2.stream().filter(e ->dto.getReadIds().contains(e.getOrgId())||dto.getOrgAid().equals(e.getSysCreateAid())||finalStrings.contains(e.getOrgId())).collect(Collectors.toList());
+                    List<Course> paginate = paginate(collect, pageIndex, pageSize);
+                    PageList<Course> rs = new PageList<>();
+                    rs.setCount(collect.size());
+                    rs.setList(paginate);
+                    return rs;
+                }
             }
         }
         List<Course> paginate = paginate(listByFilters2, pageIndex, pageSize);