Merge branch '20200324' into test

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

@@ -933,14 +933,16 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     e.setClassMode(0);
                 }
             }else{
-                Map<TeachModeEnum, Long> teachModeCourseNumMap = musicGroupTeachModeNumMap.get(e.getMusicId());
                 Long onlineCourseNum = 0L;
                 Long offlineCourseNum = 0L;
-                if(teachModeCourseNumMap.containsKey(TeachModeEnum.ONLINE)){
-                    onlineCourseNum = teachModeCourseNumMap.get(TeachModeEnum.ONLINE);
-                }
-                if(teachModeCourseNumMap.containsKey(TeachModeEnum.OFFLINE)){
-                    offlineCourseNum = teachModeCourseNumMap.get(TeachModeEnum.OFFLINE);
+                if(musicGroupTeachModeNumMap.containsKey(e.getMusicId())){
+                    Map<TeachModeEnum, Long> teachModeCourseNumMap = musicGroupTeachModeNumMap.get(e.getMusicId());
+                    if(teachModeCourseNumMap.containsKey(TeachModeEnum.ONLINE)){
+                        onlineCourseNum = teachModeCourseNumMap.get(TeachModeEnum.ONLINE);
+                    }
+                    if(teachModeCourseNumMap.containsKey(TeachModeEnum.OFFLINE)){
+                        offlineCourseNum = teachModeCourseNumMap.get(TeachModeEnum.OFFLINE);
+                    }
                 }
                 if (onlineCourseNum > 0 && offlineCourseNum <= 0) {
                     e.setClassMode(1);