空间管理

server-service/src/main/java/com/makeit/service/platform/space/impl/PlatSpaceServiceImpl.java

@@ -723,10 +723,19 @@ public class PlatSpaceServiceImpl extends ServiceImpl<PlatSpaceMapper, PlatSpace
 
         //床位
         LambdaQueryWrapper<PlatBed> queryWrapper1 = new LambdaQueryWrapper<>();
+        List<PlatBed> listBeds = platBedService.list(queryWrapper1);
         if(flag){
-            queryWrapper1.eq(PlatBed::getStatus, CommonEnum.YES.getValue());
+
+            PlatBed bed = null;
+            if(platElder != null && StringUtil.isNotEmpty(platElder.getBedId())){
+                bed = listBeds.stream().filter(item->item.getId().equals(platElder.getBedId())).collect(Collectors.toList()).get(0);
+            }
+            listBeds = listBeds.stream().filter(item->CommonEnum.YES.getValue().equals(item.getStatus())).collect(Collectors.toList());
+            if(bed != null){
+                listBeds.add(bed);
+            }
         }
-        List<PlatBed> listBeds = platBedService.list(queryWrapper1);
+
         if(listBeds.isEmpty()){
             return new ArrayList<>();
         }