From f69eaa4fe379f3d219b01b68b94e95ef8a0a19fe Mon Sep 17 00:00:00 2001
From: shahaibo <1023316923@qq.com>
Date: Tue, 3 Jun 2025 14:39:56 +0800
Subject: [PATCH] =?UTF-8?q?TASK:collection=20sort=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ai/da/service/impl/DesignServiceImpl.java  | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
index aa8c2f13..66367b93 100644
--- a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
@@ -1332,14 +1332,16 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
         qw.lambda().orderByDesc(CollectionSort::getSort);
         List<CollectionSort> userLikeSorts = collectionSortMapper.selectList(qw);
         CollectionSort userLikeSort = getUserLikeSortByUserLikeId(relationId, relationType, projectId);
-        Long userLikeSortId = userLikeSort.getId();
-        for (CollectionSort likeSort : userLikeSorts) {
-            if (Objects.equals(likeSort.getId(), userLikeSortId)) {
-                collectionSortMapper.deleteById(likeSort);
-                break;
-            }else {
-                likeSort.setSort(likeSort.getSort() - 1);
-                collectionSortMapper.updateById(likeSort);
+        if (Objects.nonNull(userLikeSort)) {
+            Long userLikeSortId = userLikeSort.getId();
+            for (CollectionSort likeSort : userLikeSorts) {
+                if (Objects.equals(likeSort.getId(), userLikeSortId)) {
+                    collectionSortMapper.deleteById(likeSort);
+                    break;
+                }else {
+                    likeSort.setSort(likeSort.getSort() - 1);
+                    collectionSortMapper.updateById(likeSort);
+                }
             }
         }
     }