征集搜索条件

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/RoomReservationUserSearch.java

@@ -20,6 +20,11 @@ public class RoomReservationUserSearch extends QueryInfo {
     @ApiModelProperty("用户编号/用户名/用户手机号")
     private String search;
 
+    @ApiModelProperty("声部id")
+    private Integer subjectId;
+
+    @ApiModelProperty("分部id")
+    private Integer organId;
 
     public String getRoomUid() {
         return roomUid;
@@ -38,4 +43,20 @@ public class RoomReservationUserSearch extends QueryInfo {
     public void setSearch(String search) {
         this.search = search;
     }
+
+    public Integer getSubjectId() {
+        return subjectId;
+    }
+
+    public void setSubjectId(Integer subjectId) {
+        this.subjectId = subjectId;
+    }
+
+    public Integer getOrganId() {
+        return organId;
+    }
+
+    public void setOrganId(Integer organId) {
+        this.organId = organId;
+    }
 }

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

@@ -1264,7 +1264,7 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
 
     @Override
     public PageInfo<RoomReservationUserVo> queryRoomUser(RoomReservationUserSearch query) {
-        IPage<RoomReservationUserVo> page = new Page<>(query.getPage(), query.getRows());
+        IPage<RoomReservationUserVo> page = PageUtil.getPage(query.getPage(), query.getRows());
         page = baseMapper.queryRoomUser(page, query);
         return PageUtil.pageInfo(page);
     }