'优化会议室表-会议室列表接口刷选楼层显示异常的问题1'

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/service/impl/MeetingRoomServiceImpl.java

@@ -85,21 +85,33 @@ public class MeetingRoomServiceImpl extends AbstractCrudService<MeetingRoomMappe
         LambdaQueryWrapper<MeetingRoom> queryWrapper = Wrappers.lambdaQuery();
 
         if (StringUtils.isNotBlank(requestVO.getFloorName())) {
-            String floorId = null;
+            List<String> floorId = new ArrayList<>();
             QueryWrapper<MeetingFloor> query = Wrappers.query();
             query.select("floor_id").like("floor_name", requestVO.getFloorName())
                     .eq("tenant_id", SecurityUtils.getTenantId());
             List<Map<String, Object>> map = dmFloorService.listMaps(query);
             if (CollectionUtils.isNotEmpty(map)) {
-                floorId = map.get(0).get("floor_id").toString();
+                for (int i = 0; i < map.size(); i++) {
+                    floorId.add(map.get(0).get("floor_id").toString());
+                }
+            }
+
+            if(CollectionUtils.isNotEmpty(floorId)){
+                queryWrapper.like(StringUtils.isNotBlank(requestVO.getRoomName()), MeetingRoom::getRoomName, requestVO.getRoomName())
+                        .in(MeetingRoom::getFloorId, floorId)
+                        .eq(null != requestVO.getStatus(), MeetingRoom::getStatus, requestVO.getStatus())
+                        .eq(null != requestVO.getRoomStatus(), MeetingRoom::getRoomStatus, requestVO.getRoomStatus())
+                        .eq(MeetingRoom::getTenantId, SecurityUtils.getTenantId())
+                        .orderByDesc(MeetingRoom::getRoomId);
+            }else{
+                queryWrapper.like(StringUtils.isNotBlank(requestVO.getRoomName()), MeetingRoom::getRoomName, requestVO.getRoomName())
+                        .in(MeetingRoom::getFloorId, "")
+                        .eq(null != requestVO.getStatus(), MeetingRoom::getStatus, requestVO.getStatus())
+                        .eq(null != requestVO.getRoomStatus(), MeetingRoom::getRoomStatus, requestVO.getRoomStatus())
+                        .eq(MeetingRoom::getTenantId, SecurityUtils.getTenantId())
+                        .orderByDesc(MeetingRoom::getRoomId);
             }
 
-            queryWrapper.like(StringUtils.isNotBlank(requestVO.getRoomName()), MeetingRoom::getRoomName, requestVO.getRoomName())
-                    .eq(MeetingRoom::getFloorId, floorId)
-                    .eq(null != requestVO.getStatus(), MeetingRoom::getStatus, requestVO.getStatus())
-                    .eq(null != requestVO.getRoomStatus(), MeetingRoom::getRoomStatus, requestVO.getRoomStatus())
-                    .eq(MeetingRoom::getTenantId, SecurityUtils.getTenantId())
-                    .orderByDesc(MeetingRoom::getRoomId);
         }else{
             queryWrapper.like(StringUtils.isNotBlank(requestVO.getRoomName()), MeetingRoom::getRoomName, requestVO.getRoomName())
                     .eq(null != requestVO.getStatus(), MeetingRoom::getStatus, requestVO.getStatus())