后台-首页-管理列表-查询-增加分区

accompany-admin/accompany-admin-sdk/src/main/java/com/accompany/admin/vo/roomtab/RoomTabAdminVo.java

@@ -15,5 +15,5 @@ public class RoomTabAdminVo {
     private Boolean roomTabShow;        // 房间管理列表是否展示:0-不展示，1-展示
     private Boolean isHomeRecommen;     // 是否为首页推荐：0-否，1-是
     private Boolean allowSyncHomeTab;     // 是否允许该标签从房间管理列表同步到首页列表：0-否，1-是
-
+    private Integer partitionFlag;
 }

accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/room/RoomTabAdminService.java

@@ -25,12 +25,9 @@ public class RoomTabAdminService extends ServiceImpl<RoomTabMapper, RoomTab> {
     @Autowired
     private RoomTabMapper roomTabMapper;
 
-    public IPage<RoomTabAdminVo> pageRoomTab(Integer page, Integer pageSize) {
-        QueryWrapper<RoomTab> queryWrapper = Wrappers.query();
-        queryWrapper.lambda().eq(RoomTab::getStatus, Constant.StatusV2.valid);
-
+    public IPage<RoomTabAdminVo> pageRoomTab(Integer partitionId, Integer page, Integer pageSize) {
         IPage<RoomTab> pageInfo = new Page<>(page, pageSize);
-        page(pageInfo, queryWrapper);
+        roomTabMapper.pageRoomTab(pageInfo, partitionId, Constant.StatusV2.valid);
 
         IPage<RoomTabAdminVo> voPageInfo = new Page<>(pageInfo.getCurrent(), pageInfo.getSize(), pageInfo.getTotal());
         List<RoomTabAdminVo> records = pageInfo.getRecords().stream().map(entity -> {

accompany-admin/accompany-admin-web/src/main/java/com/accompany/admin/controller/room/RoomTabAdminController.java

@@ -24,11 +24,11 @@ public class RoomTabAdminController extends BaseController {
     private RoomTabAdminService roomTabAdminService;
 
     @RequestMapping("/list")
-    public PageResult<RoomTabAdminVo> roomTabList(Integer page, Integer pageSize) {
+    public PageResult<RoomTabAdminVo> roomTabList(Integer partitionId, Integer page, Integer pageSize) {
         if (null == page || null == pageSize || page < 1 || pageSize < 1) {
             throw new ServiceException(BusiStatus.PARAMERROR);
         }
-        IPage<RoomTabAdminVo> voPageInfo = roomTabAdminService.pageRoomTab(page, pageSize);
+        IPage<RoomTabAdminVo> voPageInfo = roomTabAdminService.pageRoomTab(partitionId, page, pageSize);
         return new PageResult<>(voPageInfo);
     }
 

accompany-business/accompany-business-service/src/main/java/com/accompany/business/mybatismapper/RoomTabMapper.java

@@ -3,6 +3,7 @@ package com.accompany.business.mybatismapper;
 import com.accompany.business.model.roomtab.RoomTab;
 import com.accompany.business.vo.roomtab.RoomTabVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -11,6 +12,8 @@ import java.util.List;
 @Mapper
 public interface RoomTabMapper extends BaseMapper<RoomTab> {
 
+    IPage<RoomTab> pageRoomTab(IPage<RoomTab> page, @Param("partitionId") Integer partitionId, @Param("status") Byte status);
+
     List<RoomTabVo> roomTabList(@Param("limit") String limit, @Param("status") String status, @Param("roomTabShow") Boolean roomTabShow);
 
     Integer roomTabCount(@Param("status") String status, @Param("roomTabShow") Boolean roomTabShow);

accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/RoomTabMapper.xml

@@ -31,4 +31,16 @@
     <select id="hideRoomTab">
         update room_tab set status=0 where id=#{id}
     </select>
+
+    <select id="pageRoomTab" resultType="com.accompany.business.model.roomtab.RoomTab">
+        select * from room_tab
+        where 1=1
+        <if test="partitionId != null">
+            and (partition_flag = 0 or partition_flag &amp; #{partitionId} != 0)
+        </if>
+        <if test="status != null">
+            and status = #{status}
+        </if>
+        order by seq
+    </select>
 </mapper>