Merge remote-tracking branch 'origin/master'

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

@@ -128,7 +128,10 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     public List<ClassGroup> findAllMixClassGroupByMusicGroupId(String musicGroupId) {
         List<ClassGroup> allMixClassGroup = classGroupDao.findAllMixClassGroup(musicGroupId);
         for (ClassGroup mixClassGroup : allMixClassGroup) {
-            mixClassGroup.setClassNames(classGroupDao.findMixClassChildClassGroupNames(mixClassGroup.getId()).getName());
+            ClassGroup mixClassChildClassGroup = classGroupDao.findMixClassChildClassGroupNames(mixClassGroup.getId());
+            if(mixClassChildClassGroup != null){
+                mixClassGroup.setClassNames(mixClassChildClassGroup.getName());
+            }
         }
         return allMixClassGroup;
     }

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

@@ -110,6 +110,10 @@ public class ClassGroupTeacherMapperServiceImpl extends BaseServiceImpl<Long, Cl
 
         List<CourseSchedule> classGroupNoStartCourseSchedules = courseScheduleService.findClassGroupNoStartCourseSchedules(classGroupTeacherMapperList);
 
+        if(classGroupNoStartCourseSchedules == null || classGroupNoStartCourseSchedules.size()==0){
+            return true;
+        }
+
         for (CourseSchedule classGroupNoStartCourseSchedule : classGroupNoStartCourseSchedules) {
 
             if (!classGroupNoStartCourseSchedule.getType().equals(CourseSchedule.CourseScheduleType.SINGLE) &&

mec-gateway/mec-gateway-web/src/main/resources/application.yml

@@ -4,6 +4,10 @@ server:
 spring:
   application:
     name: gateway-web
+    
+  servlet:
+    multipart:
+      max-file-size: 10MB
 
 eureka:
   client:
@@ -16,8 +20,8 @@ eureka:
 ribbon:
   eureka:
     enable: true
-  ReadTimeout: 10000
-  SocketTimeout: 3000      
+  ReadTimeout: 30000
+  SocketTimeout: 10000      
 
 ### 配置网关反向代理    
 zuul: