From 2924849d2fb05d1dff2549a8a0c0c2b3c85bc4d9 Mon Sep 17 00:00:00 2001
From: s2042968 <s2042968@ed.ac.uk>
Date: Thu, 6 Mar 2025 10:03:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=85=A5=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/EdTagLibraryController.java      |  4 ++--
 .../manage/service/EdTagLibraryService.java     |  2 +-
 .../serviceimpl/EdTagLibraryServiceImpl.java    | 17 ++++++++++++++---
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdTagLibraryController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdTagLibraryController.java
index 2bf4d57..67bfa94 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdTagLibraryController.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdTagLibraryController.java
@@ -41,9 +41,9 @@ public class EdTagLibraryController {
     // 拖拽修改排序/分组
     @GetMapping("/updateOrder")
     @UserOperation(value="修改了标签顺序", modelName = UserOperationModuleEnum.TAG)
-    public ElectromagneticResult<?> updateTagOrder(@RequestParam String tagId, @RequestParam String newParentId, @RequestParam Integer newOrderBy) {
+    public ElectromagneticResult<?> updateTagOrder(@RequestParam String tagId, @RequestParam String newTagId, @RequestParam String newParentId, @RequestParam Integer newOrderBy) {
         String updatedBy = UserThreadLocal.getUserId();
-        return ElectromagneticResultUtil.success(edTagLibraryService.updateTagOrder(tagId, newParentId, newOrderBy,updatedBy));
+        return ElectromagneticResultUtil.success(edTagLibraryService.updateTagOrder(tagId, newTagId, newParentId, newOrderBy,updatedBy));
     }
 
     // 发布标签
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdTagLibraryService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdTagLibraryService.java
index 7c77b8f..900d97e 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdTagLibraryService.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdTagLibraryService.java
@@ -32,7 +32,7 @@ public interface EdTagLibraryService extends IService<EdTagLibrary> {
      * @param tagId
      * @param newOrderBy
      */
-    Boolean updateTagOrder(String tagId, String newParentId, Integer newOrderBy, String updatedBy);
+    Boolean updateTagOrder(String tagId, String newTagId, String newParentId, Integer newOrderBy, String updatedBy);
 
     /**
      * 发布标签
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 8153621..0df3ac1 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
@@ -96,18 +96,29 @@ public class EdTagLibraryServiceImpl extends ServiceImpl<EdTagLibraryMapper, EdT
      */
     @Override
     @Transactional
-    public Boolean updateTagOrder(String tagId, String newParentId, Integer newOrderBy, String updatedBy) {
-
+    public Boolean updateTagOrder(String tagId, String newTagId, String newParentId, Integer newOrderBy, String updatedBy) {
 
         if (StringUtils.isEmpty(newParentId) || newOrderBy == null) {
             throw new IllegalArgumentException("缺少参数");
         }
-
         // 查询该标签
         EdTagLibrary tag = this.getOne(new LambdaQueryWrapper<EdTagLibrary>()
                 .eq(EdTagLibrary::getTagId, tagId));
+        // 查询交换顺序的标签/组
+        EdTagLibrary newTag = this.getOne(new LambdaQueryWrapper<EdTagLibrary>()
+                .eq(EdTagLibrary::getTagId, newTagId));
 
         Assert.notNull(tag,"标签不存在");
+        Assert.notNull(newTag, "无法将标签移动到此位置");
+
+        // 若标签挪到空标签组下，newTagId为新标签组Id
+        if (!tag.getType().equals(newTag.getType())) {
+            if (tag.getType().equals(TagTypeEnum.TAG.getCode())) {
+                newParentId = newTagId;
+            } else {
+                throw new BizException("标签组无法移动到标签下");
+            }
+        }
 
         String oldParentId = tag.getParentId();
         Integer oldOrderBy = tag.getOrderBy();