From 0df3284e218b2c4c3e84077e2fdb6814663d68c0 Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Mon, 13 Jan 2025 14:09:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/serviceimpl/EdFileInfoServiceImpl.java       | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

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<EdFileInfoMapper, EdFileI
     @Override
     public ElectromagneticResult<?> 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<EdFileInfoMapper, EdFileI
         String userDownloadDataDir = downloadDataDir + File.separator + UserThreadLocal.getUserId();
         String[] ids = dataIdArr.split(",");
         Map<String, Boolean> 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<String, EdFileInfo> maps = new HashMap<>();
         for (String id : ids) {
             Map<String, EdFileInfo> edFileInfos = this.baseMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class)