diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdFileInfoService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdFileInfoService.java index 9344e93..da1a2df 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdFileInfoService.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdFileInfoService.java @@ -198,4 +198,10 @@ public interface EdFileInfoService { */ void resetFileInfoName(EdFileInfo fileInfo); + /** + * 判断是否是文件夹 + * @param id + * @return + */ + public boolean isFolder(String id); } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java index 6c76d8c..aa60557 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java @@ -1303,4 +1303,16 @@ public class EdFileInfoServiceImpl extends ServiceImpl queryFileList (Page page, List ids, FileInfoQueryDTO queryDTO, int saveStatus, int effectFlag) { return this.baseMapper.queryFileList(page, ids, queryDTO, saveStatus, effectFlag); } + + /** + * 判断是否是文件夹 + * @param id + * @return + */ + @Override + public boolean isFolder(String id) { + EdFileInfo fileInfo = this.baseMapper.selectById(id); + Assert.notNull(fileInfo, StrFormatter.format("文件不存在,ID为{}", id)); + return fileInfo.getDataType().equals(EleDataTypeEnum.FOLDER.code); + } } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileRelationServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileRelationServiceImpl.java index 925eec6..5785c71 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileRelationServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileRelationServiceImpl.java @@ -57,6 +57,11 @@ public class EdFileRelationServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(EdFileRelation::getId1, queryId1).eq(EdFileRelation::getId2, queryId2) .or()