fixbugs

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/user/model/User.java

@@ -263,5 +263,13 @@ public class User implements Serializable {
 	public static long getSerialversionuid() {
 		return serialVersionUID;
 	}
+	
+	public Set<Integer> getSchoolIds() {
+		Set<Integer> set = new HashSet<Integer>();
+		for (School s : this.getSchools()) {
+			set.add(s.getId());
+		}
+		return set;
+	}
 
 }

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

@@ -59,7 +59,8 @@ public class ExamInfoController extends BaseApiController {
         if (query.getSchoolId() == null && user.getSchoolId() != null) {
             query.setSchoolId(user.getSchoolId());
         }
-        if(user.getSchools().contains(query.getSchoolId())){
+        
+        if(user.getSchoolIds().contains(query.getSchoolId())){
         	// query.setCreatorId(user.getId());
         	// query.addStatus(ExamStatus.START);
         	// query.setPageNumber(1);
@@ -119,7 +120,7 @@ public class ExamInfoController extends BaseApiController {
         User user = RequestUtils.getApiUser(request);
         JSONObject result = new JSONObject();
         Exam exam = examService.findById(subject.getExamId());
-        if (exam != null && user.getSchools().contains(exam.getSchoolId())) {
+        if (exam != null && user.getSchoolIds().contains(exam.getSchoolId())) {
             ExamSubject es = subjectService.find(subject.getExamId(), subject.getCode());
             if (es != null) {
                 if (subject.getHasAnswer() != null) {

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

@@ -51,7 +51,7 @@ public class ExamPackageController extends BaseApiController {
         User user = RequestUtils.getApiUser(request);
         JSONArray array = new JSONArray();
         Exam exam = examService.findById(examId);
-        if (exam != null && user.getSchools().contains(exam.getSchoolId())) {
+        if (exam != null && user.getSchoolIds().contains(exam.getSchoolId())) {
             List<String> list = examStudentService.findDistinctPackageCode(examId);
             if (list != null) {
                 for (String code : list) {
@@ -72,7 +72,7 @@ public class ExamPackageController extends BaseApiController {
         User user = RequestUtils.getApiUser(request);
         JSONArray array = new JSONArray();
         Exam exam = examService.findById(examId);
-        if (exam != null && user.getSchools().contains(exam.getSchoolId())) {
+        if (exam != null && user.getSchoolIds().contains(exam.getSchoolId())) {
             List<ExamPackage> list = upload != null ? packageService.list(examId, upload) : packageService.list(examId);
             if (list != null) {
                 for (ExamPackage ep : list) {
@@ -95,7 +95,7 @@ public class ExamPackageController extends BaseApiController {
             @RequestBody ExamPackage examPackage) {
         User user = RequestUtils.getApiUser(request);
         Exam exam = examService.findById(examId);
-        if (exam != null && user.getSchools().contains(exam.getSchoolId())) {
+        if (exam != null && user.getSchoolIds().contains(exam.getSchoolId())) {
             ExamPackage obj = packageService.find(examId, examPackage.getCode());
             if (obj != null && examPackage.getPicCount() != null) {
                 obj.setPicCount(examPackage.getPicCount());

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

@@ -80,7 +80,7 @@ public class ExamStudentController extends BaseApiController {
             @RequestBody MenualAbsentDTO[] datas) {
         User user = RequestUtils.getApiUser(request);
         Exam exam = examService.findById(examId);
-        if (exam != null && user.getSchools().contains(exam.getSchoolId())) {
+        if (exam != null && user.getSchoolIds().contains(exam.getSchoolId())) {
             for (MenualAbsentDTO dto : datas) {
                 examStudentService.updateManualAbsent(examId, dto.getExamNumber(), dto.isAbsent());
             }
@@ -96,7 +96,7 @@ public class ExamStudentController extends BaseApiController {
     public Object clearManualAbsent(HttpServletRequest request, @RequestParam Integer examId) {
         User user = RequestUtils.getApiUser(request);
         Exam exam = examService.findById(examId);
-        if (exam != null && user.getSchools().contains(exam.getSchoolId())) {
+        if (exam != null && user.getSchoolIds().contains(exam.getSchoolId())) {
             examStudentService.clearManualAbsent(examId);
             return true;
         } else {
@@ -119,7 +119,7 @@ public class ExamStudentController extends BaseApiController {
             pageSize = 1000;
         }
 
-        if (exam != null && user.getSchools().contains(exam.getSchoolId())) {
+        if (exam != null && user.getSchoolIds().contains(exam.getSchoolId())) {
             List<ExamStudent> esList = examStudentService.findByExamId(examId, pageNumber, pageSize);
             for (ExamStudent student : esList) {
                 JSONObject obj = new JSONObject();
@@ -150,7 +150,7 @@ public class ExamStudentController extends BaseApiController {
         User user = RequestUtils.getApiUser(request);
         JSONArray array = new JSONArray();
         Exam exam = examService.findById(examId);
-        if (exam != null && user.getSchools().contains(exam.getSchoolId())) {
+        if (exam != null && user.getSchoolIds().contains(exam.getSchoolId())) {
             ExamStudentSearchQuery query = new ExamStudentSearchQuery();
             query.setExamId(examId);
             query.setUpload(upload);
@@ -185,7 +185,7 @@ public class ExamStudentController extends BaseApiController {
             @RequestParam(required = false) Boolean upload, @RequestParam(required = false) Boolean absent) {
         User user = RequestUtils.getApiUser(request);
         Exam exam = examService.findById(examId);
-        if (exam != null && user.getSchools().contains(exam.getSchoolId())) {
+        if (exam != null && user.getSchoolIds().contains(exam.getSchoolId())) {
             ExamStudentSearchQuery query = new ExamStudentSearchQuery();
             query.setExamId(examId);
             query.setUpload(upload);
@@ -206,7 +206,7 @@ public class ExamStudentController extends BaseApiController {
             return array;
         }
         Exam exam = examService.findById(query.getExamId());
-        if (exam != null && user.getSchools().contains(exam.getSchoolId())) {
+        if (exam != null && user.getSchoolIds().contains(exam.getSchoolId())) {
             DecimalFormat format = new DecimalFormat("####.##");
             examStudentService.findByQuery(query);
             for (ExamStudent student : query.getResult()) {
@@ -613,7 +613,7 @@ public class ExamStudentController extends BaseApiController {
         // 验证考试与管理员账号
         User user = RequestUtils.getApiUser(request);
         Exam exam = examService.findById(examId);
-        if (exam == null || !user.getSchools().contains(exam.getSchoolId())) {
+        if (exam == null || !user.getSchoolIds().contains(exam.getSchoolId())) {
             throw ApiException.EXAM_NOT_ACCESSIBLED;
         }
         // 验证考生是否存在

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

@@ -44,8 +44,8 @@ public class LoginController extends BaseApiController {
 		JSONArray array = new JSONArray();
 		for (School school : user.getSchools()) {
 			JSONObject obj = new JSONObject();
-			obj.accumulate("schoolId", school.getId());
-			obj.accumulate("schoolName", school.getName());
+			obj.accumulate("id", school.getId());
+			obj.accumulate("name", school.getName());
 			array.add(obj);
 		}
 		return array;

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

@@ -64,7 +64,7 @@ public class ScanController extends BaseApiController {
 
         Exam exam = examService.findById(examId);
         // 判断上传权限
-        if (exam == null || !user.getSchools().contains(exam.getSchoolId())) {
+        if (exam == null || !user.getSchoolIds().contains(exam.getSchoolId())) {
             throw ApiException.EXAM_NOT_ACCESSIBLED;
         }