|
|
@@ -314,7 +314,7 @@ public class StudentReportRecordController {
|
|
|
new StudentReportRecordItemVo(){{
|
|
|
setItem(className);
|
|
|
setCount(classMap.get(className).size());
|
|
|
- if(!(classNotMap.get(className).isEmpty())){
|
|
|
+ if(classNotMap.get(className) != null && !(classNotMap.get(className).isEmpty())){
|
|
|
setCount2(classNotMap.get(className).size());
|
|
|
}
|
|
|
}}
|
|
|
@@ -330,7 +330,7 @@ public class StudentReportRecordController {
|
|
|
new StudentReportRecordItemVo(){{
|
|
|
setItem(classType);
|
|
|
setCount(classTypeMap.get(classType).size());
|
|
|
- if(!(classTypeNotMap.get(classType).isEmpty())){
|
|
|
+ if(classTypeNotMap.get(classType) != null && !(classTypeNotMap.get(classType).isEmpty())){
|
|
|
setCount2(classTypeNotMap.get(classType).size());
|
|
|
}
|
|
|
}}
|
|
|
@@ -346,7 +346,7 @@ public class StudentReportRecordController {
|
|
|
new StudentReportRecordItemVo(){{
|
|
|
setItem(majorName);
|
|
|
setCount(majorMap.get(majorName).size());
|
|
|
- if(!(majorNotMap.get(majorName).isEmpty())){
|
|
|
+ if(majorNotMap.get(majorName) != null && !(majorNotMap.get(majorName).isEmpty())){
|
|
|
setCount2(majorNotMap.get(majorName).size());
|
|
|
}
|
|
|
}}
|