修复成绩分析按科目及格分和优秀分问题

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/report/utils/module/SubjectModule.java

@@ -108,7 +108,9 @@ public class SubjectModule implements Module {
             unit = new BaseCalculatorUnit();
             unit.passScore = context.getPassScore();
             unit.excellentScore = context.getExcellentScore();
-            ExamSubject subject = context.getSubject(key);
+
+            String keys[] = key.split("\t");
+            ExamSubject subject = context.getSubject(keys[0]);
             if (subject != null && subject.getPassScore() != null) {
                 unit.passScore = subject.getPassScore();
             }

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

@@ -102,7 +102,8 @@ public class ScoreController extends BaseExamController {
             buildPackageUrl(student);
             buildAnswerUrl(student);
         }
-        String exportMessage = query.getSubjectCode() != null ? enableExport(examId, query.getSubjectCode()) : null;
+        String exportMessage = StringUtils.isNotBlank(query.getSubjectCode()) ? enableExport(examId,
+                query.getSubjectCode()) : null;
         if (exportMessage != null) {
             view.addObject("exportMessage", exportMessage);
             view.addObject("enableExport", false);
@@ -186,7 +187,7 @@ public class ScoreController extends BaseExamController {
         }
         Set<String> subjectSet = new HashSet<>();
         // 单科目导出
-        if (query.getSubjectCode() != null) {
+        if (StringUtils.isNotBlank(query.getSubjectCode())) {
             String exportMessage = enableExport(exam.getId(), query.getSubjectCode());
             // 判断不允许导出则直接返回
             if (exportMessage != null) {