更新回看复核无法打回问题

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

@@ -253,10 +253,13 @@ public class InspectedController extends BaseExamController {
         JSONObject obj = new JSONObject();
         ExamStudent student = studentService.findById(rejectResult.getStudentId());
         WebUser wu = RequestUtils.getWebUser(request);
-        if (student != null
-                && inspectedService.hasApplied(student, wu.getId())
-                && (student.getSubjectiveStatus().equals(SubjectiveStatus.MARKED) || student.getSubjectiveStatus()
-                        .equals(SubjectiveStatus.INSPECTED))) {
+        if (student == null) {
+            obj.accumulate("success", false);
+            obj.accumulate("message", "无法打回");
+            return obj;
+        }
+        if ((inspectedService.hasApplied(student, wu.getId()) && (student.getSubjectiveStatus()
+                .equals(SubjectiveStatus.MARKED))) || student.getSubjectiveStatus().equals(SubjectiveStatus.INSPECTED)) {
             if (subjectCheck(student.getSubjectCode(), wu) && lockService.trylock(LockType.STUDENT, student.getId())) {
                 try {
                     lockService.watch(LockType.EXAM_SUBJECT, student.getExamId(), student.getSubjectCode());
@@ -279,9 +282,6 @@ public class InspectedController extends BaseExamController {
                 obj.accumulate("success", false);
                 obj.accumulate("message", "无法打回");
             }
-        } else {
-            obj.accumulate("success", false);
-            obj.accumulate("message", "无法打回");
         }
         return obj;
     }

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

@@ -358,11 +358,11 @@ public class LibraryController extends BaseExamController {
                     lockService.watch(LockType.EXAM_SUBJECT, library.getExamId(), library.getSubjectCode());
                     lockService.watch(LockType.GROUP, library.getExamId(), library.getSubjectCode(),
                             library.getGroupNumber());
-                    if (libraryService.hasApplied(library, wu.getId())
-                            && (library.getStatus().equals(LibraryStatus.MARKED)
-                                    || library.getStatus().equals(LibraryStatus.PROBLEM) || library.getStatus().equals(
-                                    LibraryStatus.INSPECTED))
-                            && markService.rejectLibrary(library, rejectResult.getQuestionList(), wu.getId())) {
+
+                    if (((libraryService.hasApplied(library, wu.getId())
+                            && (library.getStatus().equals(LibraryStatus.MARKED)) || library.getStatus().equals(
+                            LibraryStatus.INSPECTED)) && markService.rejectLibrary(library,
+                            rejectResult.getQuestionList(), wu.getId()))) {
                         libraryService.releaseByLibrary(library);
                         obj.accumulate("success", true);
                     } else {