fix:删除房间关联床位问题，导入空间属性问题

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

@@ -122,6 +122,13 @@ public class PlatRoomServiceImpl extends ServiceImpl<PlatRoomMapper, PlatRoom> i
         }
         removeByIds(ids);
 
+        List<PlatBed> bedList = platBedService.list(new QueryWrapper<PlatBed>().lambda()
+                .in(PlatBed::getRoomId, ids));
+
+        boolean hashFree = bedList.stream().anyMatch(platBed -> CommonEnum.NO.getValue().equals(platBed.getStatus()));
+        if (hashFree) {
+            throw new BusinessException(CodeMessageEnum.PLATFORM_ERROR_BAD_NOT_DEL);
+        }
         //删除床位
         platBedService.remove(new QueryWrapper<PlatBed>().lambda()
                 .in(PlatBed::getRoomId, ids));

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

@@ -132,6 +132,9 @@ public class PlatSpaceServiceImpl extends ServiceImpl<PlatSpaceMapper, PlatSpace
             space.setParentId(null);
         }else {
             space.setParentId(dto.getParentId());
+            PlatSpace parentSpace = getById(dto.getParentId());
+            space.setOrgId(parentSpace.getOrgId());
+            space.setAttribute(parentSpace.getAttribute());
         }
 
         //上级空间
@@ -547,6 +550,11 @@ public class PlatSpaceServiceImpl extends ServiceImpl<PlatSpaceMapper, PlatSpace
                             if (org != null) {
                                 platSpace.setAttribute(org.getType());
                             }
+                            PlatSpace parentSpace = getById(firstId);
+                            if (parentSpace != null) {
+                                platSpace.setOrgId(parentSpace.getOrgId());
+                                platSpace.setAttribute(parentSpace.getAttribute());
+                            }
                             save(platSpace);
                             childrenIdMap.put(secondKey, platSpace.getId());
                             secondId = platSpace.getId();
@@ -579,6 +587,11 @@ public class PlatSpaceServiceImpl extends ServiceImpl<PlatSpaceMapper, PlatSpace
                             if (org != null) {
                                 platSpace.setAttribute(org.getType());
                             }
+                            PlatSpace parentSpace = getById(secondId);
+                            if (parentSpace != null) {
+                                platSpace.setOrgId(parentSpace.getOrgId());
+                                platSpace.setAttribute(parentSpace.getAttribute());
+                            }
                             save(platSpace);
                             childrenIdMap.put(threeKey, platSpace.getId());
                             threeId = platSpace.getId();
@@ -609,6 +622,11 @@ public class PlatSpaceServiceImpl extends ServiceImpl<PlatSpaceMapper, PlatSpace
                             if (org != null) {
                                 platSpace.setAttribute(org.getType());
                             }
+                            PlatSpace parentSpace = getById(threeId);
+                            if (parentSpace != null) {
+                                platSpace.setOrgId(parentSpace.getOrgId());
+                                platSpace.setAttribute(parentSpace.getAttribute());
+                            }
                             platSpace.setParentId(threeId);
                             platSpace.setParentPath(firstId + "," + secondId + "," + threeId);
                             save(platSpace);