Merge branch 'saas_2022_05_17_activity' into master_saas

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ImLiveBroadcastRoom.java

@@ -19,6 +19,11 @@ import java.io.Serializable;
  */
 @ApiModel(value = "im_live_broadcast_room-直播房间管理表")
 public class ImLiveBroadcastRoom implements Serializable {
+
+    public static final String ALL = "ALL";
+    public static final String ORGAN = "ORGAN";
+    public static final String SCHOOL = "SCHOOL";
+
     @TableId(value = "id_", type = IdType.AUTO)
     @ApiModelProperty(value = "主键")
     private Integer id;

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

@@ -283,6 +283,14 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
         if (now.getTime() > dto.getLiveStartTime().getTime()) {
             throw new BizException("设置的直播开始时间不能小于当前时间");
         }
+
+        String popularizeType = dto.getPopularizeType();
+        if (popularizeType.equals(ImLiveBroadcastRoom.ALL)) {
+            dto.setPopularizeOrgIds(null);
+            dto.setPopularizeSchoolIds(null);
+        } else if (popularizeType.equals(ImLiveBroadcastRoom.ORGAN)) {
+            dto.setPopularizeSchoolIds(null);
+        }
         BeanUtils.copyProperties(dto, obj);
         obj.setRoomConfig(JSONObject.toJSONString(dto.getRoomConfig()));
         log.info("update room  >>>  :{}", JSONObject.toJSONString(obj));