From e26819824abf35335c0450ccf0876446d4dc3d72 Mon Sep 17 00:00:00 2001
From: s2042968 <s2042968@ed.ac.uk>
Date: Thu, 20 Mar 2025 15:36:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=BA=9F=E9=99=A4=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E5=90=8C=E6=97=B6=E5=BA=9F=E9=99=A4=E6=A0=87=E7=AD=BE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdTagLibraryServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdTagLibraryServiceImpl.java
index 3694052..240d3e6 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdTagLibraryServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdTagLibraryServiceImpl.java
@@ -187,9 +187,14 @@ public class EdTagLibraryServiceImpl extends ServiceImpl<EdTagLibraryMapper, EdT
         Assert.notNull(tag, "标签不存在");
         // 如果是标签组，级联删除其下的所有标签
         if (tag.getType() == 0) {
+
+            // 查询所有子标签
+            List<EdTagLibrary> tags = this.list(new LambdaQueryWrapper<EdTagLibrary>()
+                    .eq(EdTagLibrary::getParentId, tagId));
+            // 删除所有子标签的关联关系
+            fileTagRelationMapper.delete(new LambdaQueryWrapper<FileTagRelation>().in(FileTagRelation::getTagId, tags.stream().map(EdTagLibrary::getTagId).collect(Collectors.toList())));
+            // 删除所有子标签
             this.remove(new LambdaQueryWrapper<EdTagLibrary>().eq(EdTagLibrary::getParentId, tagId));
-            // 删除标签关联文件
-            fileTagRelationMapper.delete(new LambdaQueryWrapper<FileTagRelation>().eq(FileTagRelation::getTagId, tagId));
         }
         // 删除本身
         boolean isDeleted = this.removeById(tagId);