Commit 3f97453f authored by ryzeycy's avatar ryzeycy

xx

parent 22546f68
...@@ -326,7 +326,7 @@ public class GeneratorAllTypePdfByProvinceController { ...@@ -326,7 +326,7 @@ public class GeneratorAllTypePdfByProvinceController {
logger.info("subjectReport:loading"); logger.info("subjectReport:loading");
String subSubject = parameters.getSubSubject(); String subSubject = parameters.getSubSubject();
if (!subSubject.equals("物理") || !subSubject.equals("历史")) { if (!subSubject.equals("物理") && !subSubject.equals("历史")) {
continue; continue;
} }
logger.info("exitCode:" + parameters.getSubSubject()); logger.info("exitCode:" + parameters.getSubSubject());
...@@ -440,7 +440,7 @@ public class GeneratorAllTypePdfByProvinceController { ...@@ -440,7 +440,7 @@ public class GeneratorAllTypePdfByProvinceController {
List<ClassBasicReportParameters> list = collect.get(arg.getClassName()); List<ClassBasicReportParameters> list = collect.get(arg.getClassName());
for (ClassBasicReportParameters classBasicReportParameters : list) { for (ClassBasicReportParameters classBasicReportParameters : list) {
String subSubject = classBasicReportParameters.getSubSubject(); String subSubject = classBasicReportParameters.getSubSubject();
if (!subSubject.equals("物理") || !subSubject.equals("历史")) { if (!subSubject.equals("物理") && !subSubject.equals("历史")) {
continue; continue;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment