Merge branch 'feature/0803-im'

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

@@ -462,9 +462,6 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
                 }
 
             }else {
-                List<ImNetworkRoomMember> roomMembers = imNetworkRoomMemberService.lambdaQuery()
-                        .eq(ImNetworkRoomMember::getRoomId,deviceControl.getRoomId())
-                        .eq(ImNetworkRoomMember::getRole,RoleEnum.RoleStudent.getValue()).list();
                 // 同步全员静音状态
                 if (deviceControl.getDeviceType() == ImNetworkDeviceTypeEnum.MICROPHONE || deviceControl.getCancelMuteFlag() != null) {
                     if(deviceControl.getCancelMuteFlag() == null){
@@ -482,10 +479,15 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
                     updateChatRoomGroupData(deviceControl.getRoomId(), courseSchedule, pluginService);
                 }
 
-                if (!CollectionUtils.isEmpty(roomMembers)) {
-                    for (ImNetworkRoomMember roomMember : roomMembers) {
-                        deviceControl.setUserId(roomMember.getUserId());
-                        controlDevice(deviceControl);
+                if(deviceControl.getCancelMuteFlag() == null){
+                    List<ImNetworkRoomMember> roomMembers = imNetworkRoomMemberService.lambdaQuery()
+                            .eq(ImNetworkRoomMember::getRoomId,deviceControl.getRoomId())
+                            .eq(ImNetworkRoomMember::getRole,RoleEnum.RoleStudent.getValue()).list();
+                    if (!CollectionUtils.isEmpty(roomMembers)) {
+                        for (ImNetworkRoomMember roomMember : roomMembers) {
+                            deviceControl.setUserId(roomMember.getUserId());
+                            controlDevice(deviceControl);
+                        }
                     }
                 }
             }