Merge branch 'feature/0803-im'

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

@@ -467,10 +467,15 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
                         .eq(ImNetworkRoomMember::getRole,RoleEnum.RoleStudent.getValue()).list();
                 // 同步全员静音状态
                 if (deviceControl.getDeviceType() == ImNetworkDeviceTypeEnum.MICROPHONE || deviceControl.getCancelMuteFlag() != null) {
-                    courseScheduleService.lambdaUpdate().eq(CourseSchedule::getId,deviceControl.getRoomId())
-                                    .set(CourseSchedule::getMuteAll,!deviceControl.getEnable())
-                                    .set(CourseSchedule::getCancelMuteFlag,deviceControl.getCancelMuteFlag())
-                            .update();
+                    if(deviceControl.getCancelMuteFlag() == null){
+                        courseScheduleService.lambdaUpdate().eq(CourseSchedule::getId,deviceControl.getRoomId())
+                                .set(CourseSchedule::getMuteAll,!deviceControl.getEnable())
+                                .update();
+                    }else {
+                        courseScheduleService.lambdaUpdate().eq(CourseSchedule::getId,deviceControl.getRoomId())
+                                .set(CourseSchedule::getCancelMuteFlag,deviceControl.getCancelMuteFlag())
+                                .update();
+                    }
                     CourseSchedule courseSchedule = courseScheduleService.getById(deviceControl.getRoomId());
                     // 修改网管课群自定义属性
                     RTCRoomPluginService pluginService = imGroupService.getRTCRoomPluginService(courseSchedule.getServiceProvider());