fix bug

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/report/service/impl/ReportServiceImpl.java

@@ -185,6 +185,9 @@ public class ReportServiceImpl implements ReportService {
             // ", exam is null or status error");
             return;
         }
+        if (!lockService.trylock(LockType.SCORE_CALCULATE, examId)) {
+            return;
+        }
         if (subjectCodeSet == null) {
             subjectCodeSet = new HashSet<String>();
             List<ExamSubject> list = subjectService.list(exam.getId());
@@ -196,7 +199,6 @@ public class ReportServiceImpl implements ReportService {
         }
         log.info("start report for examId=" + examId + ", subjectCode count=" + subjectCodeSet.size());
 
-        lockService.trylock(LockType.SCORE_CALCULATE, examId);
         for (String subjectCode : subjectCodeSet) {
             // 尝试上锁，失败直接跳过
             if (!lockService.trylock(LockType.SCORE_CALCULATE, examId, subjectCode)) {

stmms-web/src/main/java/cn/com/qmth/stmms/admin/user/UserController.java

@@ -231,16 +231,16 @@ public class UserController extends BaseExamController {
             String message = validate(previous, subjectCodeString, examIdString);
             if (message == null) {
                 if (previous.getRole() == Role.SUBJECT_HEADER || user.getRole() == Role.INSPECTOR) {
-                    user.refreshAccessToken();
+                    previous.refreshAccessToken();
                     subjectUserService.updateByUserId(previous.getId(), getSubjectCodeSet(subjectCodeString));
                 }
                 if (user.getRole() == Role.SCHOOL_VIEWER) {
-                    user.refreshAccessToken();
+                    previous.refreshAccessToken();
                     userExamService.updateByUserId(user.getId(), getExamIdSet(examIdString));
                     subjectUserService.updateByUserId(previous.getId(), getSubjectCodeSet(subjectCodeString));
                 }
                 if (user.getRole() == Role.COLLEGE_ADMIN) {
-                    user.refreshAccessToken();
+                    previous.refreshAccessToken();
                     subjectUserService.updateByUserId(user.getId(),
                             getSubjectCodeSetByCollege(examId, user.getDescription()));
                 }

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/rejectList.jsp

@@ -122,6 +122,12 @@
             $('#group-select').empty();
             if (code == '') {
                 $('#group-select').val('').trigger('change');
+                $('#marker-select').empty();
+                $('#marker-select').append('<option value="0">不限</option>');
+                $('#marker-select').val('0').trigger('change');
+                $('#rejecter-select').empty();
+                $('#rejecter-select').append('<option value="0">不限</option>');
+                $('#rejecter-select').val('0').trigger('change');
                 return;
             }
 
@@ -158,7 +164,6 @@
             $('#rejecter-select').empty();
             $('#rejecter-select').append('<option value="0">不限</option>');
             $('#rejecter-select').val('0').trigger('change');
-            var subjectCode = $('#subject-select').val();
             $.post('${ctx}/admin/exam/reject/user/query', {subjectCode: subjectCode}, function (result) {
                 var parent = $('#rejecter-select');
                 var first = '';