diff --git a/bonus-admin/src/main/java/com/bonus/web/controller/archive/FileManagementController.java b/bonus-admin/src/main/java/com/bonus/web/controller/archive/FileManagementController.java index a9ee840..14f4a08 100644 --- a/bonus-admin/src/main/java/com/bonus/web/controller/archive/FileManagementController.java +++ b/bonus-admin/src/main/java/com/bonus/web/controller/archive/FileManagementController.java @@ -89,13 +89,17 @@ public class FileManagementController extends BaseController { @SysLog(title = "第四级档案信息", module = "档案管理->档案右侧列表", businessType = OperaType.QUERY, details = "第四级档案信息", logType = 1) @RequiresPermissions("file:manage:query") public TableDataInfo getFileManage(DaKyProFilesContentsDto dto) { - Integer level = fileManageMapper.getLevelById(dto.getParentId().toString()); - if (level == 4) { - startPage(); - List list = fileManageService.FileManage(dto); - return getDataTable(list); - } else { + if (dto.getParentId() == 0) { return getDataTable(new ArrayList<>()); + } else { + Integer level = fileManageMapper.getLevelById(dto.getParentId().toString()); + if (level == 4) { + startPage(); + List list = fileManageService.FileManage(dto); + return getDataTable(list); + } else { + return getDataTable(new ArrayList<>()); + } } } diff --git a/bonus-admin/src/main/java/com/bonus/web/controller/tool/TreeBuilder.java b/bonus-admin/src/main/java/com/bonus/web/controller/tool/TreeBuilder.java index a4c3bb9..da06e19 100644 --- a/bonus-admin/src/main/java/com/bonus/web/controller/tool/TreeBuilder.java +++ b/bonus-admin/src/main/java/com/bonus/web/controller/tool/TreeBuilder.java @@ -55,7 +55,7 @@ public class TreeBuilder { .collect(Collectors.toList()); // 使用 Map 提升查找效率 - Map map = new HashMap<>(); + Map map = new HashMap<>(); List roots = new ArrayList<>(); // 第一步:将所有节点放入 map @@ -70,7 +70,7 @@ public class TreeBuilder { if (parentId == null) { roots.add(item); } else { - DaKyProFilesContentsDto parent = map.get(parentId); + DaKyProFilesContentsDto parent = map.get(parentId.toString()); if (parent != null) { parent.getChildren().add(item); }