ting.yin 4 年之前
父節點
當前提交
f28d8526ec
共有 1 個文件被更改,包括 5 次插入3 次删除
  1. 5 3
      stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/LibraryController.java

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

@@ -357,10 +357,12 @@ 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 ((library.getStatus().equals(LibraryStatus.MARKED)
-                            || library.getStatus().equals(LibraryStatus.PROBLEM) || library.getStatus().equals(
-                            LibraryStatus.INSPECTED))
+                    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())) {
+                        libraryService.releaseByLibrary(library);
                         obj.accumulate("success", true);
                     } else {
                         obj.accumulate("success", false);