chenxz 8 éve
szülő
commit
009045b8b9

+ 1 - 1
mooctest-site-server/src/main/java/cn/iselab/mooctest/site/Application.java

@@ -107,7 +107,7 @@ public class Application {
 
         // To disabled web environment, change `true` to `false`
         application.setWebEnvironment(true);
-        //application.addListeners(new ApplicationStartup());
+        application.addListeners(new ApplicationStartup());
         application.run(args);
     }
 }

+ 0 - 2
mooctest-site-server/src/main/java/cn/iselab/mooctest/site/service/fromKibug/impl/ReportServiceImpl.java

@@ -92,8 +92,6 @@ public class ReportServiceImpl implements ReportService {
         report.setId(incrementId.getId());
         report.setCaseTakeId(caseTake.getId());
         report.setStatus((short)1);
-        if(report.getDescription()==null)
-            report.setDescription(new JSONArray().toString());
         reportDao.save(report);
 
         reportPermissionService.uploadReport(vo.getWorkerId(),report.getId());

+ 1 - 1
mooctest-site-server/src/main/java/cn/iselab/mooctest/site/util/data/JSONUtil.java

@@ -18,7 +18,7 @@ public class JSONUtil {
         }
     }
     public static boolean isJsonArray(String json){
-        if(json==null)
+        if(json==null || json=="")
             return false;
         Object object = new JSONTokener(json).nextValue();
         if(object instanceof JSONArray){

+ 4 - 2
mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/data/wrapper/ReportVOWrapper.java

@@ -48,8 +48,10 @@ public class ReportVOWrapper {
 
     public Report unwrap(ReportVO vo){
         Report report= Converter.convert(Report.class,vo);
-        JSONArray jsonArray=new JSONArray(vo.getReportCases());
-        report.setDescription(jsonArray.toString());
+        if(vo.getReportCases()!=null) {
+            JSONArray jsonArray = new JSONArray(vo.getReportCases());
+            report.setDescription(jsonArray.toString());
+        }
         return report;
     }
 }