fixbugs

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/ArbitrateController.java

@@ -158,9 +158,11 @@ public class ArbitrateController extends BaseExamController {
         releaseByUser(wu.getUser().getId());
         JSONObject setting = new JSONObject();
         MarkGroup group = null;
-
         if (historyId != null) {
             ArbitrateHistory history = arbitrateService.findById(historyId);
+            if (history == null) {
+                return setting;
+            }
             subjectCode = history.getSubjectCode();
             group = groupService.findOne(examId, subjectCode, history.getGroupNumber());
             setting.accumulate("selective", group.isSelective());
@@ -306,6 +308,9 @@ public class ArbitrateController extends BaseExamController {
         WebUser wu = RequestUtils.getWebUser(request);
         if (historyId != null) {
             ArbitrateHistory history = arbitrateService.findById(historyId);
+            if (history == null) {
+                return new Task();
+            }
             MarkGroup group = groupService.findOne(examId, history.getSubjectCode(), history.getGroupNumber());
             return taskService.build(history, group);
         }