Merge branch 'feature/0803-im'

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

@@ -464,13 +464,14 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
             }else {
                 // 同步全员静音状态
                 if (deviceControl.getDeviceType() == ImNetworkDeviceTypeEnum.MICROPHONE || deviceControl.getCancelMuteFlag() != null) {
-                    if(deviceControl.getCancelMuteFlag() == null){
+                    if(deviceControl.getEnable() == null){
                         courseScheduleService.lambdaUpdate().eq(CourseSchedule::getId,deviceControl.getRoomId())
-                                .set(CourseSchedule::getMuteAll,!deviceControl.getEnable())
+                                .set(CourseSchedule::getCancelMuteFlag,deviceControl.getCancelMuteFlag())
                                 .update();
                     }else {
                         courseScheduleService.lambdaUpdate().eq(CourseSchedule::getId,deviceControl.getRoomId())
                                 .set(CourseSchedule::getCancelMuteFlag,deviceControl.getCancelMuteFlag())
+                                .set(CourseSchedule::getMuteAll,!deviceControl.getEnable())
                                 .update();
                     }
                     CourseSchedule courseSchedule = courseScheduleService.getById(deviceControl.getRoomId());
@@ -479,7 +480,7 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
                     updateChatRoomGroupData(deviceControl.getRoomId(), courseSchedule, pluginService);
                 }
 
-                if(deviceControl.getCancelMuteFlag() == null){
+                if(deviceControl.getEnable() != null){
                     List<ImNetworkRoomMember> roomMembers = imNetworkRoomMemberService.lambdaQuery()
                             .eq(ImNetworkRoomMember::getRoomId,deviceControl.getRoomId())
                             .eq(ImNetworkRoomMember::getRole,RoleEnum.RoleStudent.getValue()).list();