Browse Source

fix: devcloud公开项目查看

mjh 4 years ago
parent
commit
a12d5f22b4

+ 8 - 8
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/serviceImpl/ProjectServiceImpl.java

@@ -96,14 +96,14 @@ public class ProjectServiceImpl implements ProjectService {
         // public
         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);
-            }
+            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();

+ 1 - 1
seecoder-portal-server/src/main/java/cn/seecoder/seecoderportalserver/serviceImpl/subsystem/DevcloudServiceImpl.java

@@ -138,7 +138,7 @@ public class DevcloudServiceImpl implements DevcloudService {
                 throw CustomErrorException.devcloudError(result.toString());
             }
         } catch (NullPointerException e) {
-            throw CustomErrorException.devcloudError("devcloud result = NULL!");
+            throw CustomErrorException.devcloudError("forkProject() = NULL!");
         }
     }