From 2bd779500247b9c97283d45c44f7db6db8e97642 Mon Sep 17 00:00:00 2001
From: s2042968 <s2042968@ed.ac.uk>
Date: Thu, 27 Feb 2025 16:52:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=98=B2=E6=AD=A2=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E5=A4=B9=E5=BB=BA=E7=AB=8B=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../software/manage/service/EdFileInfoService.java   |  6 ++++++
 .../service/serviceimpl/EdFileInfoServiceImpl.java   | 12 ++++++++++++
 .../serviceimpl/EdFileRelationServiceImpl.java       |  5 +++++
 3 files changed, 23 insertions(+)

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<EdFileInfoMapper, EdFileI
     public IPage<FileInfoVO> queryFileList (Page<FileInfoVO> page, List<String> 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<EdFileRelationMapper,
         // 无法建立已建立的关系
         String queryId1 = edFileRelation.getId1();
         String queryId2 = edFileRelation.getId2();
+
+        if (edFileInfoService.isFolder(queryId1) || edFileInfoService.isFolder(queryId2)) {
+            throw new BizException("文件夹无法建立关系");
+        }
+
         LambdaQueryWrapper<EdFileRelation> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(EdFileRelation::getId1, queryId1).eq(EdFileRelation::getId2, queryId2)
                 .or()