Merge remote-tracking branch 'remotes/origin/dev_1.3.15' into release_1.3.15

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

@@ -309,8 +309,14 @@ public class InspectedController extends BaseExamController {
     public JSONObject cancel(HttpServletRequest request, @RequestParam Integer studentId) {
         JSONObject obj = new JSONObject();
         ExamStudent student = studentService.findById(studentId);
+        if(student==null) {
+        	obj.accumulate("success", false);
+            obj.accumulate("message", "未找到考生信息");
+            return obj;
+        }
+        obj.accumulate("subjectCode", student.getSubjectCode());
         WebUser wu = RequestUtils.getWebUser(request);
-        if (student != null && subjectCheck(student.getSubjectCode(), wu)) {
+        if (subjectCheck(student.getSubjectCode(), wu)) {
             try {
                 lockService.watch(LockType.EXAM_SUBJECT, student.getExamId(), student.getSubjectCode());
                 lockService.waitlock(LockType.STUDENT, studentId);
@@ -332,9 +338,6 @@ public class InspectedController extends BaseExamController {
             obj.accumulate("success", false);
             obj.accumulate("message", "没有操作该评卷任务的权限");
         }
-        if(student!=null) {
-        	obj.accumulate("subjectCode", student.getSubjectCode());
-        }
         return obj;
     }