From b1c860643221fe1e9a96a84413a9aad137cf2c13 Mon Sep 17 00:00:00 2001
From: shahaibo <1023316923@qq.com>
Date: Thu, 3 Apr 2025 13:49:36 +0800
Subject: [PATCH] =?UTF-8?q?TASK:=E6=A8=A1=E5=9D=97=E5=8C=96=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/UserLikeGroupServiceImpl.java        | 58 +++++++++++--------
 1 file changed, 35 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
index 8800c49c..3e92314e 100644
--- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
@@ -1662,39 +1662,51 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
             MoodBoardModuleSaveDTO moodBoard = moduleSaveDTO.getMoodBoard();
             if (moodBoard.getMoodTemplateId() != null) {
                 // moodboard合成图存储
-                QueryWrapper<CollectionElement> qw = new QueryWrapper<>();
-                qw.lambda().eq(CollectionElement::getProjectId, moduleSaveDTO.getProjectId());
-                qw.lambda().eq(CollectionElement::getLevel1Type, CollectionLevel1TypeEnum.MOOD_BOARD.getRealName());
-                qw.lambda().eq(CollectionElement::getCollectionId, 0);
-                List<CollectionElement> compositeImageList = collectionElementMapper.selectList(qw);
-                if (CollectionUtils.isEmpty(compositeImageList)) {
-                    CollectionElement collectionElement = collectionElementMapper.selectById(moodBoard.getMoodTemplateId());
-                    collectionElement.setProjectId(moduleSaveDTO.getProjectId());
-                    collectionElementMapper.updateById(collectionElement);
+                CollectionElement compositeImage = collectionElementMapper.selectById(moodBoard.getMoodTemplateId());
+                if (compositeImage.getProjectId() == null) {
+                    compositeImage.setProjectId(moduleSaveDTO.getProjectId());
+                    collectionElementMapper.updateById(compositeImage);
                     if (!StringUtils.isEmpty(moodBoard.getMoodboardPosition())) {
                         // 合成图位置信息通过collectElementId关联（旧逻辑通过collectionId关联）
-                        designService.parseMoodboardPosition(moodBoard.getMoodboardPosition(), collectionElement.getId());
-                    }
-                }else {
-                    CollectionElement compositeImage = compositeImageList.get(0);
-                    if (!Objects.equals(compositeImage.getId(), moodBoard.getMoodTemplateId())) {
-                        compositeImage.setProjectId(null);
-                        CollectionElement collectionElement = collectionElementMapper.selectById(moodBoard.getMoodTemplateId());
-                        collectionElement.setProjectId(moduleSaveDTO.getProjectId());
-                        collectionElementMapper.updateById(collectionElement);
-                        if (!StringUtils.isEmpty(moodBoard.getMoodboardPosition())) {
-                            // 合成图位置信息通过collectElementId关联（旧逻辑通过collectionId关联）
-                            designService.parseMoodboardPosition(moodBoard.getMoodboardPosition(), collectionElement.getId());
-                        }
+                        designService.parseMoodboardPosition(moodBoard.getMoodboardPosition(), compositeImage.getId());
                     }
                 }
+//                QueryWrapper<CollectionElement> qw = new QueryWrapper<>();
+//                qw.lambda().eq(CollectionElement::getProjectId, moduleSaveDTO.getProjectId());
+//                qw.lambda().eq(CollectionElement::getLevel1Type, CollectionLevel1TypeEnum.MOOD_BOARD.getRealName());
+////                qw.lambda().eq(CollectionElement::getCollectionId, 0);
+//                List<CollectionElement> compositeImageList = collectionElementMapper.selectList(qw);
+//                if (CollectionUtils.isEmpty(compositeImageList)) {
+//                    CollectionElement collectionElement = collectionElementMapper.selectById(moodBoard.getMoodTemplateId());
+//                    collectionElement.setProjectId(moduleSaveDTO.getProjectId());
+//                    collectionElementMapper.updateById(collectionElement);
+//                    if (!StringUtils.isEmpty(moodBoard.getMoodboardPosition())) {
+//                        // 合成图位置信息通过collectElementId关联（旧逻辑通过collectionId关联）
+//                        designService.parseMoodboardPosition(moodBoard.getMoodboardPosition(), collectionElement.getId());
+//                    }
+//                }else {
+//                    CollectionElement compositeImage = compositeImageList.get(0);
+//                    if (!Objects.equals(compositeImage.getId(), moodBoard.getMoodTemplateId())) {
+//                        compositeImage.setProjectId(null);
+//                        CollectionElement collectionElement = collectionElementMapper.selectById(moodBoard.getMoodTemplateId());
+//                        collectionElement.setProjectId(moduleSaveDTO.getProjectId());
+//                        collectionElementMapper.updateById(collectionElement);
+//                        if (!StringUtils.isEmpty(moodBoard.getMoodboardPosition())) {
+//                            // 合成图位置信息通过collectElementId关联（旧逻辑通过collectionId关联）
+//                            designService.parseMoodboardPosition(moodBoard.getMoodboardPosition(), collectionElement.getId());
+//                        }
+//                    }
+//                }
             }
             List<DesignCollectionElementDTO> moodBoards = moodBoard.getMoodBoards();
             if (CollectionUtil.isNotEmpty(moodBoards)) {
                 QueryWrapper<CollectionElement> qw = new QueryWrapper<>();
                 qw.lambda().eq(CollectionElement::getProjectId, projectId);
                 qw.lambda().eq(CollectionElement::getLevel1Type, CollectionLevel1TypeEnum.MOOD_BOARD.getRealName());
-                qw.lambda().ne(CollectionElement::getCollectionId, 0);
+                if (moodBoard.getMoodTemplateId() != null) {
+                    qw.lambda().ne(CollectionElement::getId, moodBoard.getMoodTemplateId());
+                }
+//                qw.lambda().ne(CollectionElement::getCollectionId, 0);
                 List<CollectionElement> collectionElements = collectionElementMapper.selectList(qw);
                 Set<Long> old = collectionElements.stream().map(CollectionElement::getId).collect(Collectors.toSet());