Merge branch 'online'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherServiceImpl.java

@@ -494,6 +494,10 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
     @Override
     @Transactional(rollbackFor = Exception.class)
 	public boolean updateStyleVideo(Long userId, List<TeacherStyleVideo> styleVideo, String message) {
+    	
+    	if(styleVideo == null){
+    		styleVideo = new ArrayList<TeacherStyleVideo>();
+    	}
 
         Map<Long, TeacherStyleVideo> oldMap = teacherStyleVideoService.list(Wrappers.<TeacherStyleVideo>lambdaQuery()
                         .eq(TeacherStyleVideo::getUserId, userId))
@@ -537,7 +541,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
             receivers.put(userId, user.getPhone());
 
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, "系统消息", message, receivers, null,
-                    0, null, ClientEnum.STUDENT.getCode());
+                    0, null, ClientEnum.TEACHER.getCode());
 
         } catch (Exception e) {
             log.error("[老师风采修改]发送消息失败--> {}", e.fillInStackTrace());