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 14f4a08..924146b 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,10 +89,10 @@ public class FileManagementController extends BaseController { @SysLog(title = "第四级档案信息", module = "档案管理->档案右侧列表", businessType = OperaType.QUERY, details = "第四级档案信息", logType = 1) @RequiresPermissions("file:manage:query") public TableDataInfo getFileManage(DaKyProFilesContentsDto dto) { - if (dto.getParentId() == 0) { + if (dto.getParentId().equals("0")) { return getDataTable(new ArrayList<>()); } else { - Integer level = fileManageMapper.getLevelById(dto.getParentId().toString()); + Integer level = fileManageMapper.getLevelById(dto.getParentId()); if (level == 4) { startPage(); List list = fileManageService.FileManage(dto); @@ -107,7 +107,7 @@ public class FileManagementController extends BaseController { @PostMapping("addFileManageRight") @SysLog(title = "新增右侧档案树", module = "档案管理->档案目录管理", businessType = OperaType.INSERT, details = "新增右侧档案树", logType = 1) @RequiresPermissions("file:manage:add") - public R saveArchivalCatalogue(@RequestBody @Validated DaKyProFilesContentsVo dto) { + public R saveArchivalCatalogue(@RequestParam @Validated DaKyProFilesContentsVo dto) { try { if (dto.getParentId() == null) { return R.fail("父级有误"); 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 da06e19..52a3eb2 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 @@ -65,12 +65,12 @@ public class TreeBuilder { // 第二步:构建父子关系 for (DaKyProFilesContentsDto item : validList) { - Integer parentId = item.getParentId(); + String parentId = item.getParentId(); // 如果 parent_id 为 null,则为根节点 if (parentId == null) { roots.add(item); } else { - DaKyProFilesContentsDto parent = map.get(parentId.toString()); + DaKyProFilesContentsDto parent = map.get(parentId); if (parent != null) { parent.getChildren().add(item); } diff --git a/bonus-admin/src/main/java/com/bonus/web/domain/DaKyProFilesContentsDto.java b/bonus-admin/src/main/java/com/bonus/web/domain/DaKyProFilesContentsDto.java index d0a6999..63472f7 100644 --- a/bonus-admin/src/main/java/com/bonus/web/domain/DaKyProFilesContentsDto.java +++ b/bonus-admin/src/main/java/com/bonus/web/domain/DaKyProFilesContentsDto.java @@ -35,7 +35,7 @@ public class DaKyProFilesContentsDto { * 父节点id */ @NotNull(message = "上级节点不能为空") - private Integer parentId; + private String parentId; private String parentName; diff --git a/bonus-admin/src/main/java/com/bonus/web/service/impl/FileManageServiceImpl.java b/bonus-admin/src/main/java/com/bonus/web/service/impl/FileManageServiceImpl.java index 401dd92..df83745 100644 --- a/bonus-admin/src/main/java/com/bonus/web/service/impl/FileManageServiceImpl.java +++ b/bonus-admin/src/main/java/com/bonus/web/service/impl/FileManageServiceImpl.java @@ -57,6 +57,8 @@ public class FileManageServiceImpl implements FileManageService { } String uuid32 = UUID.randomUUID().toString().replace("-", "").toLowerCase(); dto.setId(uuid32); + dto.setDataSource("1"); + dto.setIsUnique("1"); return R.ok(fileManageMapper.saveFileManage(dto)); }