Merge remote-tracking branch 'origin/saas_2022_05_17_activity' into saas_2022_05_17_activity

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

@@ -309,7 +309,7 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
         String popularizeOrgan = sysConfigDao.findConfigValue("live_popularize_organ");
         if (StringUtils.isNotBlank(popularizeOrgan)) {
             List<String> organList = WrapperUtil.toList(popularizeOrgan);
-            if (organList.contains(user.getOrganId().toString())) {
+            if (Objects.nonNull(user.getOrganId()) && organList.contains(user.getOrganId().toString())) {
                 return null;
             }
         }