diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesTypeController.java b/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesTypeController.java index 2b0c815..fb1cc8f 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesTypeController.java +++ b/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesTypeController.java @@ -65,7 +65,8 @@ public class ArchivesTypeController { if (archivesTypeDTO.getIsType() == 1 || archivesTypeDTO.getIsType() == 4) { throw new BaseException("文件夹或卷内不能被选中"); } - return ApiResponse.success(archivesTypeService.create(archivesTypeDTO)); + archivesTypeService.create(archivesTypeDTO); + return ApiResponse.success(ResponseStatus.SUCCESS); } @ApiOperation("修改门类") diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/service/ArchivesTypeService.java b/archives/src/main/java/com/storeroom/modules/dictionary/service/ArchivesTypeService.java index 6e8113f..53f3a55 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/service/ArchivesTypeService.java +++ b/archives/src/main/java/com/storeroom/modules/dictionary/service/ArchivesTypeService.java @@ -17,7 +17,7 @@ public interface ArchivesTypeService { * 创建门类 * @param archivesTypeDTO */ - ArchivesType create(ArchivesTypeDTO archivesTypeDTO); + void create(ArchivesTypeDTO archivesTypeDTO); /** diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesTypeServiceImpl.java b/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesTypeServiceImpl.java index f851d80..f98a8bb 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesTypeServiceImpl.java +++ b/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesTypeServiceImpl.java @@ -39,10 +39,11 @@ public class ArchivesTypeServiceImpl implements ArchivesTypeService { @Override @Transactional(rollbackFor = Exception.class) - public ArchivesType create(ArchivesTypeDTO archivesTypeDTO) { + public void create(ArchivesTypeDTO archivesTypeDTO) { //#生成表名称 String tableName = "tb_"; ArchivesType archivesType = archivesTypeMapper.toEntity(archivesTypeDTO); + List artChilder= archivesType.getChildren(); List archivesType1 = archivesTypeRepository.findByCnName(archivesType.getCnName()); if (archivesType1.size() == 0) { @@ -63,8 +64,7 @@ public class ArchivesTypeServiceImpl implements ArchivesTypeService { } //如果模板类型为案卷 if (item.getIsType() == 3) { - ArchivesType ar = createTemplateRoot(archivesTypeDTO.getPid(),cnName, item); - createInChive(ar.getId(), cnName, item.getChildren()); + createArchives(archivesTypeDTO.getPid(),cnName, artChilder); } //如果是文件级 if (item.getIsType() == 5){ @@ -84,7 +84,6 @@ public class ArchivesTypeServiceImpl implements ArchivesTypeService { } }); } - return archivesType; } tableName += DateUtils.getNowDateTime(); @@ -96,8 +95,6 @@ public class ArchivesTypeServiceImpl implements ArchivesTypeService { } else { throw new BaseException("门类名称不能重复"); } - - return archivesType; } private ArchivesType createTemplateRoot(String pid,String cnName, ArchivesType item) {