|
|
@@ -97,13 +97,6 @@ public class ProjectServiceImpl implements ProjectService {
|
|
|
List<CourseProject> publicProjects = courseProjectRepository.findByCourse_IdAndIsPublic(courseId, true);
|
|
|
for (CourseProject courseProject : publicProjects) {
|
|
|
projects.getJSONArray("public").add(this.findProjectById(courseProject.getProjectId()));
|
|
|
-// if (SecurityUtils.getCurrentUser().getRole() == UserRole.TEACHER) {
|
|
|
-// projects.getJSONArray("public").add(findProjectById(courseProject.getProjectId()));
|
|
|
-// } else {
|
|
|
-// JSONObject object = new JSONObject();
|
|
|
-// object.put("id", courseProject.getProjectId());
|
|
|
-// projects.getJSONArray("public").add(object);
|
|
|
-// }
|
|
|
}
|
|
|
// private
|
|
|
JSONArray allProjects = this.findAllProjects();
|
|
|
@@ -156,11 +149,12 @@ public class ProjectServiceImpl implements ProjectService {
|
|
|
}
|
|
|
JSONObject devcloudResult = devcloudService.forkProject(projectId, name);
|
|
|
log.info("devcloudService.forkProject: {}", devcloudResult);
|
|
|
+ CourseProject forkCourseProject = new CourseProject();
|
|
|
Integer newProjectId = devcloudResult.getInteger("projectId");
|
|
|
- courseProject.setProjectId(newProjectId);
|
|
|
- courseProject.setCourse(courseMapper.courseVOToCourse(courseService.findCourseById(courseProject.getCourse().getId())));
|
|
|
- courseProject.setPublic(false);
|
|
|
- courseProjectRepository.save(courseProject);
|
|
|
+ forkCourseProject.setProjectId(newProjectId);
|
|
|
+ forkCourseProject.setCourse(courseProject.getCourse());
|
|
|
+ forkCourseProject.setPublic(false);
|
|
|
+ courseProjectRepository.save(forkCourseProject);
|
|
|
// 若当前用户已组队,则将队友添加到当前项目当中
|
|
|
List<UserVO> members;
|
|
|
try {
|