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 cb2f17d..6730e8e 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 @@ -32,11 +32,8 @@ import com.electromagnetic.industry.software.manage.pojo.resp.FileProjectVO; import com.electromagnetic.industry.software.manage.pojo.resp.FileVersionViewVO; import com.electromagnetic.industry.software.manage.pojo.resp.UploadRecordVO; import com.electromagnetic.industry.software.manage.service.EdFileInfoService; -import com.electromagnetic.industry.software.manage.service.EdFileRelationService; import com.electromagnetic.industry.software.manage.service.FileSystemService; import com.electromagnetic.industry.software.manage.service.PermissionService; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Lazy; import org.springframework.core.env.Environment; import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.InputStreamResource; @@ -194,7 +191,6 @@ public class EdFileInfoServiceImpl extends ServiceImpl delete(String id) { EdFileInfo fileInfo = this.baseMapper.selectById(id); - String parentId = fileInfo.getParentId(); if (fileInfo.getDataType() == EleDataTypeEnum.FOLDER.code) { return commonService.deleteFolder(id); } @@ -604,9 +600,8 @@ public class EdFileInfoServiceImpl extends ServiceImpl map = permissionService.filterExportIds(ids); - if (map.containsValue(Boolean.FALSE)) { - throw new BizException(-1, "有未授权的层级目录,禁止导出"); - } + log.info("map is -->" + map); + Assert.isTrue(!map.containsValue(Boolean.FALSE), "有未授权的层级目录,禁止导出"); Map maps = new HashMap<>(); for (String id : ids) { Map edFileInfos = this.baseMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class)