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 56fdb42..a9ee840 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 @@ -9,6 +9,7 @@ import com.bonus.common.enums.OperaType; import com.bonus.web.domain.DaKyProFilesContentsDto; import com.bonus.web.domain.ProjectDto; import com.bonus.web.domain.vo.DaKyProFilesContentsVo; +import com.bonus.web.mapper.FileManageMapper; import com.bonus.web.service.FileManageService; import com.bonus.web.service.ProjectService; import io.swagger.annotations.ApiOperation; @@ -33,10 +34,12 @@ public class FileManagementController extends BaseController { @Autowired private FileManageService fileManageService; - @Autowired private ProjectService service; + @Autowired + private FileManageMapper fileManageMapper; + @ApiOperation(value = "档案管理列表") @GetMapping("getProjectList") @SysLog(title = "档案管理列表", module = "档案管理->项目管理", businessType = OperaType.QUERY, details = "档案管理列表", logType = 1) @@ -86,12 +89,12 @@ public class FileManagementController extends BaseController { @SysLog(title = "第四级档案信息", module = "档案管理->档案右侧列表", businessType = OperaType.QUERY, details = "第四级档案信息", logType = 1) @RequiresPermissions("file:manage:query") public TableDataInfo getFileManage(DaKyProFilesContentsDto dto) { - try { + Integer level = fileManageMapper.getLevelById(dto.getParentId().toString()); + if (level == 4) { startPage(); List list = fileManageService.FileManage(dto); return getDataTable(list); - } catch (Exception e) { - log.error(e.toString(), e); + } else { return getDataTable(new ArrayList<>()); } } 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 1d612f3..d0a6999 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 @@ -37,6 +37,8 @@ public class DaKyProFilesContentsDto { @NotNull(message = "上级节点不能为空") private Integer parentId; + private String parentName; + /** * 层级 */ diff --git a/bonus-admin/src/main/resources/mapper/FileManageMapper.xml b/bonus-admin/src/main/resources/mapper/FileManageMapper.xml index 1cbd6db..42f5fbc 100644 --- a/bonus-admin/src/main/resources/mapper/FileManageMapper.xml +++ b/bonus-admin/src/main/resources/mapper/FileManageMapper.xml @@ -122,11 +122,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"