老人导出修改bug

server-common/src/main/java/com/makeit/utils/data/excel/easyexcel/ConfigConverter.java

@@ -60,7 +60,9 @@ public class ConfigConverter implements Converter<String> {
         String s = Arrays.stream(cellData.getStringValue().split(dictEnumFormat.split())).filter(StringUtils::isNotBlank).map(m::get).filter(StringUtils::isNotBlank).collect(Collectors.joining(","));
         String s = Arrays.stream(cellData.getStringValue().split(dictEnumFormat.split())).filter(StringUtils::isNotBlank).map(m::get).filter(StringUtils::isNotBlank).collect(Collectors.joining(","));
 
 
         if (StringUtils.isBlank(s)) {
         if (StringUtils.isBlank(s)) {
-            s = "";
+            //s = "";
+
+            s = cellData.getStringValue();
         }
         }
 
 
         return s;
         return s;
@@ -89,7 +91,10 @@ public class ConfigConverter implements Converter<String> {
         String s = Arrays.stream(value.split(",")).filter(StringUtils::isNotBlank).map(m::get).filter(StringUtils::isNotBlank).collect(Collectors.joining(dictEnumFormat.split().substring(dictEnumFormat.split().length() - 1)));
         String s = Arrays.stream(value.split(",")).filter(StringUtils::isNotBlank).map(m::get).filter(StringUtils::isNotBlank).collect(Collectors.joining(dictEnumFormat.split().substring(dictEnumFormat.split().length() - 1)));
 
 
         if (StringUtils.isBlank(s)) {
         if (StringUtils.isBlank(s)) {
-            s = "";
+            //s = "";
+
+            s = value;
+
         }
         }
 
 
         return new WriteCellData(s);
         return new WriteCellData(s);

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

@@ -258,6 +258,12 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
 
 
         List<TreeDTOVO> treeList = BeanDtoVoUtils.listVo(spaceList, TreeDTOVO.class);
         List<TreeDTOVO> treeList = BeanDtoVoUtils.listVo(spaceList, TreeDTOVO.class);
 
 
+        treeList.forEach(e->{
+            if(StringUtils.isBlank(e.getParentId())){
+                e.setParentId(TreeConst.TOP_LEVEL);
+            }
+        });
+
         List<PlatRoom> roomList = platRoomService.list(new QueryWrapper<PlatRoom>().lambda()
         List<PlatRoom> roomList = platRoomService.list(new QueryWrapper<PlatRoom>().lambda()
                 .in(PlatRoom::getName, spaceNameList));
                 .in(PlatRoom::getName, spaceNameList));
 
 
@@ -325,7 +331,7 @@ public class PlatElderServiceImpl extends ServiceImpl<PlatElderMapper, PlatElder
                 if (c != 0) {
                 if (c != 0) {
 
 
                     int lastNotBlankIndex = -1;
                     int lastNotBlankIndex = -1;
-                    for (int j = 0; j < 4; j++) {
+                    for (int j = 0; j < 3; j++) {
                         if (StringUtils.isNotBlank(spaceName.get(j))) {
                         if (StringUtils.isNotBlank(spaceName.get(j))) {
                             lastNotBlankIndex = j;
                             lastNotBlankIndex = j;
                         }
                         }