|
|
@@ -91,18 +91,21 @@ public class ProjectServiceImpl implements ProjectService {
|
|
|
if (!courseService.isCourseAccessible(courseId)) {
|
|
|
throw CustomErrorException.unauthorizedUser();
|
|
|
}
|
|
|
+ log.info("课程被锁定");
|
|
|
JSONObject projects = new JSONObject();
|
|
|
projects.put("public", new JSONArray());
|
|
|
projects.put("private", new JSONArray());
|
|
|
// public
|
|
|
List<CourseProject> publicProjects = courseProjectRepository.findByCourse_IdAndIsPublic(courseId, true);
|
|
|
for (CourseProject courseProject : publicProjects) {
|
|
|
+ log.info("增加公共项目");
|
|
|
projects.getJSONArray("public").add(this.findProjectById(courseProject.getProjectId()));
|
|
|
}
|
|
|
// private
|
|
|
JSONArray allProjects = this.findAllProjects();
|
|
|
for (Object o : allProjects) {
|
|
|
JSONObject project = (JSONObject) o;
|
|
|
+ log.info("增加私有项目");
|
|
|
CourseProject courseProject = courseProjectRepository.findById(project.getInteger("id")).orElse(null);
|
|
|
if (courseProject != null && !courseProject.getPublic()) {
|
|
|
projects.getJSONArray("private").add(project);
|
xuxiaopang