Merge branch 'master' into river

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ClassGroupServiceImpl.java

@@ -1979,8 +1979,16 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             }
             classGroup.setClassGroupTeacherMapperList(classGroupTeacherMappers);
             classGroup.setStudentNum(studyNums.get(classGroup.getId()));
-            classGroup.setTotalClassTimes(totalNumMap.get(classGroup.getId()).intValue());
-            classGroup.setCurrentClassTimes(currentNumMap.get(classGroup.getId()).intValue());
+            int totalClassTimes = 0;
+            int currentClassTimes = 0;
+            if(totalNumMap.containsKey(classGroup.getId())){
+                totalClassTimes = totalNumMap.get(classGroup.getId()).intValue();
+            }
+            if(currentNumMap.containsKey(classGroup.getId())){
+                currentClassTimes = currentNumMap.get(classGroup.getId()).intValue();
+            }
+            classGroup.setTotalClassTimes(totalClassTimes);
+            classGroup.setCurrentClassTimes(currentClassTimes);
         }
         return classGroups;
     }