update

stmms-web/src/main/java/cn/com/qmth/stmms/api/controller/BaseApiController.java

@@ -87,8 +87,8 @@ public class BaseApiController extends BaseController {
 
     protected School validate(Integer parentId, String subCode) {
         School school = schoolService.findById(parentId);
-        subCode = school.getCode() + "-" + subCode;
         if (StringUtils.isNotBlank(subCode)) {
+            subCode = school.getCode() + "-" + subCode;
             school = schoolService.findByParentIdAndSubCode(parentId, subCode);
             if (school == null || !school.isEnable()) {
                 throw ApiException.SCHOOL_NOT_ACCESSIBLED;
@@ -97,7 +97,7 @@ public class BaseApiController extends BaseController {
         return school;
     }
 
-    protected boolean validate(Integer parentId, Integer subId) {
+    protected boolean validateSchool(Integer parentId, Integer subId) {
         School sub = schoolService.findById(subId);
         if (sub == null) {
             return false;

stmms-web/src/main/java/cn/com/qmth/stmms/api/controller/CardController.java

@@ -57,7 +57,7 @@ public class CardController extends BaseApiController {
 
     private Exam validateExam(ApiUser au, Integer examId, ExamType... types) {
         Exam exam = examService.findById(examId);
-        if (exam == null || !validate(au.getSchoolId(), exam.getSchoolId()) || exam.getStatus() != ExamStatus.START) {
+        if (exam == null || !validateSchool(au.getSchoolId(), exam.getSchoolId()) || exam.getStatus() != ExamStatus.START) {
             throw ApiException.EXAM_NOT_ACCESSIBLED;
         }
         if (types != null && types.length > 0 && !Arrays.asList(types).contains(exam.getType())) {

stmms-web/src/main/java/cn/com/qmth/stmms/api/controller/CoreController.java

@@ -191,7 +191,7 @@ public class CoreController extends BaseApiController {
             @RequestParam(required = false) String examSite, @RequestParam(required = false) String examRoom) {
         ApiUser user = RequestUtils.getApiUser(request);
         Exam exam = examService.findById(examId);
-        if (exam == null || !validate(user.getSchoolId(), exam.getSchoolId()) || exam.getStatus() != ExamStatus.START) {
+        if (exam == null || !validateSchool(user.getSchoolId(), exam.getSchoolId()) || exam.getStatus() != ExamStatus.START) {
             throw ApiException.EXAM_NOT_ACCESSIBLED;
         }
         examNumber = validate("examNumber", examNumber, true, 64);
@@ -341,7 +341,7 @@ public class CoreController extends BaseApiController {
         if (exam == null) {
             throw ApiException.QUERY_PARAM_ERROR.replaceMessage("exam unexists");
         }
-        if (!exam.getSchoolId().equals(school.getId())) {
+        if (!validateSchool(school.getId(), exam.getSchoolId())) {
             throw ApiException.EXAM_NOT_ACCESSIBLED;
         }
         JSONArray array = new JSONArray();
@@ -481,7 +481,7 @@ public class CoreController extends BaseApiController {
         if (exam == null) {
             throw ApiException.QUERY_PARAM_ERROR.replaceMessage("exam unexists");
         }
-        if (!validate(school.getId(), exam.getSchoolId())) {
+        if (!validateSchool(school.getId(), exam.getSchoolId())) {
             throw ApiException.EXAM_NOT_ACCESSIBLED;
         }
         ExamStudentSearchQuery query = new ExamStudentSearchQuery();
@@ -512,7 +512,7 @@ public class CoreController extends BaseApiController {
         Exam exam = examService.findById(examId);
         if (exam == null) {
             throw ApiException.QUERY_PARAM_ERROR.replaceMessage("examId invalid");
-        } else if (!validate(user.getSchoolId(), exam.getSchoolId()) || exam.getStatus() != ExamStatus.START) {
+        } else if (!validateSchool(user.getSchoolId(), exam.getSchoolId()) || exam.getStatus() != ExamStatus.START) {
             throw ApiException.EXAM_NOT_ACCESSIBLED;
         }
         ExamSubject subject = subjectService.find(examId, code);
@@ -567,7 +567,7 @@ public class CoreController extends BaseApiController {
         Exam exam = examService.findById(paper.getExamId());
         if (exam == null) {
             throw ApiException.QUERY_PARAM_ERROR.replaceMessage("examId invalid");
-        } else if (!validate(user.getSchoolId(), exam.getSchoolId()) || exam.getStatus() != ExamStatus.START) {
+        } else if (!validateSchool(user.getSchoolId(), exam.getSchoolId()) || exam.getStatus() != ExamStatus.START) {
             throw ApiException.EXAM_NOT_ACCESSIBLED;
         }
         ExamSubject subject = subjectService.find(paper.getExamId(), paper.getSubjectCode());
@@ -644,7 +644,7 @@ public class CoreController extends BaseApiController {
         JSONArray result = new JSONArray();
         // 输入字段预处理并初步校验
         Exam exam = examService.findById(examId);
-        if (exam == null || !validate(user.getSchoolId(), exam.getSchoolId()) || exam.getStatus() != ExamStatus.START) {
+        if (exam == null || !validateSchool(user.getSchoolId(), exam.getSchoolId()) || exam.getStatus() != ExamStatus.START) {
             throw ApiException.EXAM_NOT_ACCESSIBLED;
         }
         subjectCode = validate("subjectCode", subjectCode, true, 64);
@@ -698,7 +698,7 @@ public class CoreController extends BaseApiController {
         JSONObject result = new JSONObject();
         // 输入字段预处理并初步校验
         Exam exam = examService.findById(examId);
-        if (exam == null || !validate(user.getSchoolId(), exam.getSchoolId()) || exam.getStatus() != ExamStatus.START) {
+        if (exam == null || !validateSchool(user.getSchoolId(), exam.getSchoolId()) || exam.getStatus() != ExamStatus.START) {
             throw ApiException.EXAM_NOT_ACCESSIBLED;
         }
         subjectCode = validate("subjectCode", subjectCode, true, 64);
@@ -731,7 +731,7 @@ public class CoreController extends BaseApiController {
         JSONObject result = new JSONObject();
         // 输入字段预处理并初步校验
         Exam exam = examService.findById(examId);
-        if (exam == null || !validate(user.getSchoolId(), exam.getSchoolId()) || exam.getStatus() != ExamStatus.START) {
+        if (exam == null || !validateSchool(user.getSchoolId(), exam.getSchoolId()) || exam.getStatus() != ExamStatus.START) {
             throw ApiException.EXAM_NOT_ACCESSIBLED;
         }
         subjectCode = validate("subjectCode", subjectCode, true, 64);
@@ -751,7 +751,7 @@ public class CoreController extends BaseApiController {
         JSONObject result = new JSONObject();
         // 输入字段预处理并初步校验
         Exam exam = examService.findById(dto.getExamId());
-        if (exam == null || !validate(user.getSchoolId(), exam.getSchoolId()) || exam.getStatus() != ExamStatus.START) {
+        if (exam == null || !validateSchool(user.getSchoolId(), exam.getSchoolId()) || exam.getStatus() != ExamStatus.START) {
             throw ApiException.EXAM_NOT_ACCESSIBLED;
         }
         String subjectCode = validate("subjectCode", dto.getSubjectCode(), true, 64);
@@ -803,7 +803,7 @@ public class CoreController extends BaseApiController {
         // 输入字段预处理并初步校验
         account = validate("account", account, true, 32);
         Exam exam = examService.findById(examId);
-        if (exam == null || !validate(user.getSchoolId(), exam.getSchoolId()) || exam.getStatus() != ExamStatus.START) {
+        if (exam == null || !validateSchool(user.getSchoolId(), exam.getSchoolId()) || exam.getStatus() != ExamStatus.START) {
             throw ApiException.EXAM_NOT_ACCESSIBLED;
         }
         subjectCode = validate("subjectCode", subjectCode, true, 64);
@@ -869,7 +869,7 @@ public class CoreController extends BaseApiController {
         JSONArray result = new JSONArray();
         // 输入字段预处理并初步校验
         Exam exam = examService.findById(examId);
-        if (exam == null || !validate(user.getSchoolId(), exam.getSchoolId()) || exam.getStatus() != ExamStatus.START) {
+        if (exam == null || !validateSchool(user.getSchoolId(), exam.getSchoolId()) || exam.getStatus() != ExamStatus.START) {
             throw ApiException.EXAM_NOT_ACCESSIBLED;
         }
         subjectCode = validate("subjectCode", subjectCode, true, 64);
@@ -905,7 +905,7 @@ public class CoreController extends BaseApiController {
             @RequestParam String examNumber, @RequestParam Double objectiveScore) {
         ApiUser user = RequestUtils.getApiUser(request);
         Exam exam = examService.findById(examId);
-        if (exam == null || !validate(user.getSchoolId(), exam.getSchoolId()) || exam.getStatus() != ExamStatus.START
+        if (exam == null || !validateSchool(user.getSchoolId(), exam.getSchoolId()) || exam.getStatus() != ExamStatus.START
                 || exam.getType() != ExamType.MULTI_MEDIA) {
             throw ApiException.EXAM_NOT_ACCESSIBLED;
         }

stmms-web/src/main/java/cn/com/qmth/stmms/api/controller/ExamController.java

@@ -49,7 +49,7 @@ public class ExamController extends BaseApiController {
 
     private Exam validateExam(ApiUser au, Integer examId, ExamType... types) {
         Exam exam = examService.findById(examId);
-        if (exam == null || !validate(au.getSchoolId(), exam.getSchoolId()) || exam.getStatus() != ExamStatus.START) {
+        if (exam == null || !validateSchool(au.getSchoolId(), exam.getSchoolId()) || exam.getStatus() != ExamStatus.START) {
             throw ApiException.EXAM_NOT_ACCESSIBLED;
         }
         if (types != null && types.length > 0 && !Arrays.asList(types).contains(exam.getType())) {

stmms-web/src/main/java/cn/com/qmth/stmms/api/controller/FileController.java

@@ -71,7 +71,7 @@ public class FileController extends BaseApiController {
 
     private Exam validateExam(ApiUser au, Integer examId, ExamType... types) {
         Exam exam = examService.findById(examId);
-        if (exam == null || !validate(au.getSchoolId(), exam.getSchoolId()) || exam.getStatus() != ExamStatus.START) {
+        if (exam == null || !validateSchool(au.getSchoolId(), exam.getSchoolId()) || exam.getStatus() != ExamStatus.START) {
             throw ApiException.EXAM_NOT_ACCESSIBLED;
         }
         if (types != null && types.length > 0 && !Arrays.asList(types).contains(exam.getType())) {