From 4578cb57785d7be6fa6ca79bca9976c1c4b266ed Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Wed, 15 Oct 2025 16:03:08 +0800
Subject: [PATCH] =?UTF-8?q?BUGFIX:=E6=8E=92=E5=BA=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/CollectionSortServiceImpl.java       | 39 ++++++++++++++++++-
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ai/da/service/impl/CollectionSortServiceImpl.java b/src/main/java/com/ai/da/service/impl/CollectionSortServiceImpl.java
index d6e50350..afb355bf 100644
--- a/src/main/java/com/ai/da/service/impl/CollectionSortServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/CollectionSortServiceImpl.java
@@ -6,6 +6,7 @@ import com.ai.da.mapper.primary.entity.CollectionSort;
 import com.ai.da.model.dto.CollectionSortDTO;
 import com.ai.da.model.enums.CollectionType;
 import com.ai.da.service.CollectionSortService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
@@ -163,7 +164,8 @@ public class CollectionSortServiceImpl extends ServiceImpl<CollectionSortMapper,
         deleteByParentId(userLikeSortId);
 
         // 3. 批量更新排序号（使用自定义Mapper方法）
-        baseMapper.decrementSortAfterDelete(projectId, parentId, deletedSort);
+//        baseMapper.decrementSortAfterDelete(projectId, parentId, deletedSort);
+        resort(projectId, parentId);
     }
 
     private void deleteByParentId(Long parentId) {
@@ -225,7 +227,8 @@ public class CollectionSortServiceImpl extends ServiceImpl<CollectionSortMapper,
         }
         child.setSort(collectionSort.getSort());
         // 原来排序的大于等于userLikeSortId的排序的，都要＋1
-        baseMapper.increaseGenerateSortAbove(parentId, /*relationType,*/ collectionSort.getSort() - 1);
+//        baseMapper.increaseGenerateSortAbove(parentId, /*relationType,*/ collectionSort.getSort() - 1);
+        resort(collectionSort.getProjectId(), parentId);
         // 当前的生成结果则填入userLikeSortId的排序位置
         child.setUpdateTime(LocalDateTime.now());
         baseMapper.updateById(child);
@@ -262,4 +265,36 @@ public class CollectionSortServiceImpl extends ServiceImpl<CollectionSortMapper,
             return "";
         }
     }
+
+    @Transactional(rollbackFor = Exception.class)
+    public void resort(Long projectId, Long parentId) {
+
+        // 2. 查询同组数据，按原排序升序
+        List<CollectionSort> list = baseMapper.selectList(
+                new LambdaQueryWrapper<CollectionSort>()
+                        .eq(CollectionSort::getProjectId, projectId)
+                        .eq(CollectionSort::getParentId, parentId)
+                        .orderByAsc(CollectionSort::getSort)
+        );
+
+        // 3. 重新编号 sort，从 1 开始
+        for (int i = 0; i < list.size(); i++) {
+            list.get(i).setSort(i + 1);
+        }
+
+        // 4. 批量更新
+        if (!list.isEmpty()) {
+            updateBatchById(list);
+        }
+    }
+
+    /**
+     * 批量更新（如果你使用 MyBatis-Plus，可以继承 ServiceImpl 来用内置的 updateBatchById）
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void updateBatchById(List<CollectionSort> list) {
+        for (CollectionSort item : list) {
+            baseMapper.updateById(item);
+        }
+    }
 }