diff --git a/bonus-admin/src/main/java/com/bonus/web/controller/archive/ArchiveController.java b/bonus-admin/src/main/java/com/bonus/web/controller/archive/ArchiveController.java index 46a9e89..3958ab0 100644 --- a/bonus-admin/src/main/java/com/bonus/web/controller/archive/ArchiveController.java +++ b/bonus-admin/src/main/java/com/bonus/web/controller/archive/ArchiveController.java @@ -107,7 +107,7 @@ public class ArchiveController extends BaseController { @ApiOperation(value = "查询单个档案记录") @GetMapping("getArchivalCatalogueById") @SysLog(title = "查询单个档案记录", module = "档案管理->档案目录管理", businessType = OperaType.QUERY, details = "查询单个档案记录", logType = 1) - @RequiresPermissions("archive:catalogue:edit") + @RequiresPermissions("archive:catalogue:query") public R getArchivalCatalogueById(ArchivalCatalogueDto dto) { try { ArchivalCatalogueDto archivalCatalogueDto = service.getArchivalCatalogueById(dto); @@ -138,7 +138,8 @@ public class ArchiveController extends BaseController { public R editArchivalCatalogue(@RequestBody @Validated ArchivalCatalogueVo vo) { try { Integer num = service.geMaxSort(vo.getParentId().toString()); - if (vo.getSort() <= num) { + int sort = service.getSortById(vo.getId()); + if (sort != vo.getSort() && vo.getSort() <= num) { return R.fail("排序序号需大于" + num); } return service.editArchivalCatalogue(vo); diff --git a/bonus-admin/src/main/java/com/bonus/web/mapper/ArchiveMapper.java b/bonus-admin/src/main/java/com/bonus/web/mapper/ArchiveMapper.java index ee087df..2cf3e44 100644 --- a/bonus-admin/src/main/java/com/bonus/web/mapper/ArchiveMapper.java +++ b/bonus-admin/src/main/java/com/bonus/web/mapper/ArchiveMapper.java @@ -35,4 +35,8 @@ public interface ArchiveMapper { Integer getArchivalCatalogueByName(ArchivalCatalogueDto dto); Integer getArchivalCatalogueByName(ArchivalCatalogueVo dto); + + Integer getSortById(Integer id); + + String getClassifyMark(ArchivalCatalogueDto dto); } diff --git a/bonus-admin/src/main/java/com/bonus/web/service/ArchiveService.java b/bonus-admin/src/main/java/com/bonus/web/service/ArchiveService.java index 6bec8b3..87a265f 100644 --- a/bonus-admin/src/main/java/com/bonus/web/service/ArchiveService.java +++ b/bonus-admin/src/main/java/com/bonus/web/service/ArchiveService.java @@ -30,4 +30,6 @@ public interface ArchiveService { List getFilesClassifyMarkSelect(ArchivalCatalogueDto dto); Integer geMaxSort(String parentId); + + Integer getSortById(Integer id); } diff --git a/bonus-admin/src/main/java/com/bonus/web/service/impl/ArchiveServiceImpl.java b/bonus-admin/src/main/java/com/bonus/web/service/impl/ArchiveServiceImpl.java index 75a04f4..4cd14b3 100644 --- a/bonus-admin/src/main/java/com/bonus/web/service/impl/ArchiveServiceImpl.java +++ b/bonus-admin/src/main/java/com/bonus/web/service/impl/ArchiveServiceImpl.java @@ -93,7 +93,11 @@ public class ArchiveServiceImpl implements ArchiveService { @Override public ArchivalCatalogueDto getArchivalCatalogueById(ArchivalCatalogueDto dto) { - return archiveMapper.getArchivalCatalogueById(dto); + ArchivalCatalogueDto archivalCatalogueDto = archiveMapper.getArchivalCatalogueById(dto); + if (archivalCatalogueDto != null && archivalCatalogueDto.getLevel() == 4){ + archivalCatalogueDto.setClassifyMark(archiveMapper.getClassifyMark(dto)); + } + return archivalCatalogueDto; } @Override @@ -105,4 +109,9 @@ public class ArchiveServiceImpl implements ArchiveService { public Integer geMaxSort(String parentId) { return archiveMapper.geMaxSort(parentId); } + + @Override + public Integer getSortById(Integer id) { + return archiveMapper.getSortById(id); + } } diff --git a/bonus-admin/src/main/resources/mapper/ArchiveMapper.xml b/bonus-admin/src/main/resources/mapper/ArchiveMapper.xml index d028ad2..8dcf587 100644 --- a/bonus-admin/src/main/resources/mapper/ArchiveMapper.xml +++ b/bonus-admin/src/main/resources/mapper/ArchiveMapper.xml @@ -95,30 +95,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + +