Merge remote-tracking branch 'origin/test20200828' into dev_20201016

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

@@ -22,6 +22,8 @@ import cn.com.qmth.stmms.common.domain.WebUser;
 import cn.com.qmth.stmms.common.enums.*;
 import cn.com.qmth.stmms.common.utils.RequestUtils;
 import net.sf.json.JSONObject;
+
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -82,7 +84,7 @@ public class ArbitrateController extends BaseExamController {
             return "redirect:/admin/exam/mark";
         }
         query.setExamId(examId);
-        if (query.getSubjectCode() == null && !subjectList.isEmpty()) {
+        if (StringUtils.isBlank(query.getSubjectCode()) && !subjectList.isEmpty()) {
             query.setSubjectCode(subjectList.get(0).getCode());
         }
         List<MarkGroup> groupList = groupService

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

@@ -16,6 +16,8 @@ import cn.com.qmth.stmms.common.enums.LogType;
 import cn.com.qmth.stmms.common.enums.Role;
 import cn.com.qmth.stmms.common.utils.ExportExcel;
 import cn.com.qmth.stmms.common.utils.RequestUtils;
+
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.core.task.AsyncTaskExecutor;
@@ -61,7 +63,7 @@ public class ImageCheckController extends BaseExamController {
         query.setAbsent(false);
         query.setException(true);
         query.orderByExamNumber();
-        if (query.getSubjectCode() == null && !subjectList.isEmpty()) {
+        if (StringUtils.isBlank(query.getSubjectCode()) && !subjectList.isEmpty()) {
             query.setSubjectCode(subjectList.get(0).getCode());
         }
         query = studentService.findByQuery(query);

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

@@ -109,7 +109,7 @@ public class InspectedController extends BaseExamController {
         query.setAbsent(false);
         query.setBreach(false);
         List<ExamSubject> subjectList = getExamSubject(examId, wu);
-        if (query.getSubjectCode() == null && !subjectList.isEmpty()) {
+        if (StringUtils.isBlank(query.getSubjectCode()) && !subjectList.isEmpty()) {
             query.setSubjectCode(subjectList.get(0).getCode());
         }
         if (status != null) {
@@ -165,7 +165,7 @@ public class InspectedController extends BaseExamController {
         query.addStatus(SubjectiveStatus.MARKED);
         query.setPageSize(Integer.MAX_VALUE);
         List<ExamSubject> subjectList = getExamSubject(examId, wu);
-        if (query.getSubjectCode() == null && !subjectList.isEmpty()) {
+        if (StringUtils.isBlank(query.getSubjectCode()) && !subjectList.isEmpty()) {
             query.setSubjectCode(subjectList.get(0).getCode());
         }
         if (mainNumber != null || mainStartScore != null || mainEndScore != null || questionScore != null) {

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

@@ -24,6 +24,8 @@ import cn.com.qmth.stmms.common.annotation.RoleRequire;
 import cn.com.qmth.stmms.common.domain.WebUser;
 import cn.com.qmth.stmms.common.enums.*;
 import cn.com.qmth.stmms.common.utils.RequestUtils;
+
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -100,7 +102,7 @@ public class MarkQualityController extends BaseExamController {
         }
         query.setExamId(examId);
         query.orderById();
-        if (query.getSubjectCode() == null && !subjectList.isEmpty()) {
+        if (StringUtils.isBlank(query.getSubjectCode()) && !subjectList.isEmpty()) {
             query.setSubjectCode(subjectList.get(0).getCode());
         }
         List<MarkGroup> groupList = groupService.findByExamAndSubject(examId, query.getSubjectCode());