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 ba87410..d17e4e2 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 @@ -114,7 +114,7 @@ public class FileManagementController extends BaseController { if (dto.getParentId().equals("0")) { return getDataTable(new ArrayList<>()); } else { - Integer level = fileManageMapper.getLevelById(dto.getParentId()); + Integer level = fileManageMapper.getLevelById(dto); if (level == 4) { startPage(); List list = fileManageService.FileManage(dto); 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 33ce142..58a1382 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 @@ -36,7 +36,7 @@ public class TreeBuilder { for (ArchivalCatalogueDto item : validList) { Integer parentId = item.getParentId(); // 如果 parent_id 为 null,则为根节点 - if (parentId == null) { + if (parentId == null || parentId.equals("") || parentId.equals("0")) { roots.add(item); } else { ArchivalCatalogueDto parent = map.get(parentId); @@ -68,7 +68,7 @@ public class TreeBuilder { for (DaKyProFilesContentsDto item : validList) { String parentId = item.getParentId(); // 如果 parent_id 为 null,则为根节点 - if (parentId == null) { + if (parentId == null || parentId.equals("") || parentId.equals("0")) { roots.add(item); } else { DaKyProFilesContentsDto parent = map.get(parentId); diff --git a/bonus-admin/src/main/java/com/bonus/web/mapper/FileManageMapper.java b/bonus-admin/src/main/java/com/bonus/web/mapper/FileManageMapper.java index 638b863..e3b6380 100644 --- a/bonus-admin/src/main/java/com/bonus/web/mapper/FileManageMapper.java +++ b/bonus-admin/src/main/java/com/bonus/web/mapper/FileManageMapper.java @@ -38,7 +38,7 @@ public interface FileManageMapper { Integer updateIntegrityStatus(DaKyProFilesContentsDto dto); - Integer getLevelById(String id); + Integer getLevelById(DaKyProFilesContentsDto dto); Integer getMaxSort(DaKyProFilesContentsDto dto); 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 c7d6ce7..1216436 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 @@ -112,7 +112,8 @@ public class FileManageServiceImpl implements FileManageService { List list = fileManageMapper.list(daKyProFilesContentsDto); list.removeIf(dto -> "0".equals(dto.getIsUnique()) && dto.getLevel() != 1); if (daKyProFilesContentsDto.getId() != null) { - Integer level = fileManageMapper.getLevelById(daKyProFilesContentsDto.getId()); + daKyProFilesContentsDto.setParentId(daKyProFilesContentsDto.getId()); + Integer level = fileManageMapper.getLevelById(daKyProFilesContentsDto); for (Iterator it = list.iterator(); it.hasNext(); ) { DaKyProFilesContentsDto item = it.next(); if (level <= item.getLevel()) { diff --git a/bonus-admin/src/main/resources/mapper/FileManageMapper.xml b/bonus-admin/src/main/resources/mapper/FileManageMapper.xml index 01ecd8a..442ab53 100644 --- a/bonus-admin/src/main/resources/mapper/FileManageMapper.xml +++ b/bonus-admin/src/main/resources/mapper/FileManageMapper.xml @@ -214,7 +214,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM da_ky_pro_files_contents dkp WHERE - dkp.id = #{id} + dkp.id = #{parentId} and dkp.pro_id = #{proId}