发放清单没有时处理

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

@@ -160,7 +160,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         insert(classGroup);
 
         //2、插入班级学生关联关系
-        List<Integer> userIdList = new  ArrayList<>();
+        List<Integer> userIdList = new ArrayList<>();
         List<ClassGroupStudentMapper> classGroupStudentList = new ArrayList<>();
         for (String userId : userIdStrSet) {
             ClassGroupStudentMapper classGroupStudentMapper = new ClassGroupStudentMapper();
@@ -183,7 +183,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         classGroupStudentMapperDao.classGroupStudentsInsert(classGroupStudentList);
 
         //加入IM群组
-        addImGroup(classGroup,userIdList);
+        addImGroup(classGroup, userIdList);
         return classGroup;
     }
 
@@ -249,7 +249,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         classGroupRelationService.classGroupRelationsInsert(classGroupRelationList);
 
         //加入IM群组
-        addImGroup(classGroup,userIdList);
+        addImGroup(classGroup, userIdList);
 
         return classGroup;
     }
@@ -353,7 +353,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             userIdList.add(classGroupTeacherMapper.getUserId());
 
             //加入Im群组
-            addImGroup(highClassGroup,userIdList);
+            addImGroup(highClassGroup, userIdList);
         }
         return highClassGroupList;
     }
@@ -461,8 +461,10 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         List<ClassGroupTeachersDto> classGroupAndTeachers = getClassGroupAndTeachers(musicGroupId, "NORMAL,MIX,HIGH", classGroupId);
         BigDecimal zeroSalary = new BigDecimal(0);
         MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
-        musicGroup.setSettlementType(type);
-        musicGroupDao.update(musicGroup);
+        if (type != null) {
+            musicGroup.setSettlementType(type);
+            musicGroupDao.update(musicGroup);
+        }
 
         for (ClassGroupTeachersDto classGroupAndTeacher : classGroupAndTeachers) {
             //班级的教师列表