fix:修复bug

server-service/src/main/java/com/makeit/service/platform/elder/impl/PlatElderServiceImpl.java

 package com.makeit.service.platform.elder.impl;
 package com.makeit.service.platform.elder.impl;
 
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -419,9 +421,53 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
             e.setBedName(l.getName());
             e.setBedName(l.getName());
         });
         });
 
 
+        handleExcelData(list, dbList);
+
         ExcelUtil.export(response, "长者信息" + FileSuffixEnum.EXCEL.getSuffix(), "长者信息",PlatElderExportVO.class, list);
         ExcelUtil.export(response, "长者信息" + FileSuffixEnum.EXCEL.getSuffix(), "长者信息",PlatElderExportVO.class, list);
     }
     }
 
 
+    private void handleExcelData(List<PlatElderExportVO> list, List<PlatElder> dbList) {
+        if (CollUtil.isEmpty(list) || CollUtil.isEmpty(dbList)) {
+            return;
+        }
+        Map<String, PlatElder> platElderMap = StreamUtil.toMap(dbList, PlatElder::getId);
+        list.forEach(e -> {
+            PlatElder platElder = platElderMap.get(e.getId());
+            if (platElder == null) {
+                return;
+            }
+            String spacePath = platElder.getSpacePath();
+            if (StrUtil.isBlank(spacePath)) {
+                e.setStreetSpaceName(null);
+                e.setBuildingSpaceName(null);
+                e.setUnitSpaceName(null);
+                e.setFloorSpaceName(null);
+                e.setRoomName(null);
+                e.setBedName(null);
+                return;
+            }
+            List<String> pathList = Arrays.asList(spacePath.split(","));
+            if (!pathList.contains(e.getStreetSpaceId())) {
+                e.setStreetSpaceName(null);
+            }
+            if (!pathList.contains(e.getBuildingSpaceId())) {
+                e.setBuildingSpaceName(null);
+            }
+            if (!pathList.contains(e.getUnitSpaceId())) {
+                e.setUnitSpaceName(null);
+            }
+            if (!pathList.contains(e.getFloorSpaceId())) {
+                e.setFloorSpaceName(null);
+            }
+            if (!pathList.contains(e.getRoomId())) {
+                e.setRoomName(null);
+            }
+            if (!pathList.contains(e.getBedId())) {
+                e.setBedName(null);
+            }
+        });
+    }
+
     @Override
     @Override
     public void exportTemplate(HttpServletResponse response) {
     public void exportTemplate(HttpServletResponse response) {
         ExcelUtil.exportTemplate(response, "长者信息导入模板" + FileSuffixEnum.EXCEL.getSuffix(), "长者信息",PlatElderImportDTO.class);
         ExcelUtil.exportTemplate(response, "长者信息导入模板" + FileSuffixEnum.EXCEL.getSuffix(), "长者信息",PlatElderImportDTO.class);