Merge branch 'saas_2022_05_17_activity' into master_saas

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

@@ -154,6 +154,14 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
             }
             throw new BizException("直播已结束！");
         }
+        room.setBlacklistFlag(0);
+        //黑名单查询-查询当前用户是否在黑名单中
+        int count = imLiveRoomBlackService.count(Wrappers.<ImLiveRoomBlack>lambdaQuery()
+                .eq(ImLiveRoomBlack::getRoomUid, roomUid)
+                .eq(ImLiveRoomBlack::getUserId, sysUser.getId()));
+        if (count > 0) {
+            room.setBlacklistFlag(1);
+        }
         return room;
     }
 
@@ -168,14 +176,6 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
         if (roomVo == null) {
             return null;
         }
-        roomVo.setBlacklistFlag(0);
-        //黑名单查询-查询当前用户是否在黑名单中
-        int count = imLiveRoomBlackService.count(Wrappers.<ImLiveRoomBlack>lambdaQuery()
-                .eq(ImLiveRoomBlack::getRoomUid, roomUid)
-                .eq(ImLiveRoomBlack::getUserId, getSysUser().getId()));
-        if (count > 0) {
-            roomVo.setBlacklistFlag(1);
-        }
         getRoomData(roomVo);
         return roomVo;
     }