diff --git a/src/main/java/com/ai/da/mapper/primary/entity/CollectionElement.java b/src/main/java/com/ai/da/mapper/primary/entity/CollectionElement.java
index 45bec9eb..64103278 100644
--- a/src/main/java/com/ai/da/mapper/primary/entity/CollectionElement.java
+++ b/src/main/java/com/ai/da/mapper/primary/entity/CollectionElement.java
@@ -88,4 +88,6 @@ public class CollectionElement implements Serializable {
     private Date updateDate;
 
     private Long projectId;
+
+    private Integer isCompositeImage;
 }
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 930ab602..546f4873 100644
--- a/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/UserLikeGroupServiceImpl.java
@@ -1400,51 +1400,35 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
                 MoodBoardModuleChooseVO moodBoardModuleChooseVO = new MoodBoardModuleChooseVO();
                 QueryWrapper<CollectionElement> qw = new QueryWrapper<>();
                 qw.lambda().eq(CollectionElement::getProjectId, projectDTO.getId());
-//                qw.lambda().ne(CollectionElement::getCollectionId, 0);
                 qw.lambda().eq(CollectionElement::getLevel1Type, CollectionLevel1TypeEnum.MOOD_BOARD.getRealName());
                 List<CollectionElement> collectionElements = collectionElementMapper.selectList(qw);
-                Long collectionId = null;
+
+                List<CollectionElementVO> list = new ArrayList<>();
                 for (CollectionElement collectionElement : collectionElements) {
-                    if (collectionElement.getCollectionId() != null) {
-                        collectionId = collectionElement.getCollectionId();
-                        break;
-                    }
-                }
-                Collection collection = collectionService.getById(collectionId);
-                if (Objects.nonNull(collection)) {
-                    if (null != collection.getMoodboardPosition()) {
-                        String moodboardPositionString = collectionService.getMoodboardPositionString(collection.getId());
-                        if (StringUtils.isEmpty(moodboardPositionString)) {
-                            moodBoardModuleChooseVO.setMoodboardPosition(collection.getMoodboardPosition());
-                        }else {
+                    if (collectionElement.getIsCompositeImage() == 1) {
+                        moodBoardModuleChooseVO.setMoodTemplateId(String.valueOf(collectionElement.getId()));
+                        moodBoardModuleChooseVO.setMoodTemplateName(collectionElement.getName());
+                        moodBoardModuleChooseVO.setMoodTemplateUrl(minioUtil.getPreSignedUrl(collectionElement.getUrl(), 24 * 60));
+
+                        String moodboardPositionString = collectionService.getMoodboardPositionString(collectionElement.getId());
+                        if (!StringUtils.isEmpty(moodboardPositionString)) {
                             moodBoardModuleChooseVO.setMoodboardPosition(moodboardPositionString);
                         }
+                        continue;
                     }
-                    if (collection.getMoodTemplateId() != null) {
-                        CollectionElement layoutElement = collectionElementMapper.selectById(collection.getMoodTemplateId());
-                        moodBoardModuleChooseVO.setMoodTemplateId(collection.getMoodTemplateId());
-                        moodBoardModuleChooseVO.setMoodTemplateName(layoutElement.getName());
-                        moodBoardModuleChooseVO.setMoodTemplateUrl(minioUtil.getPreSignedUrl(layoutElement.getUrl(), 24 * 60));
+                    CollectionElementVO collectionElementVO = CopyUtil.copyObject(collectionElement, CollectionElementVO.class);
+                    collectionElementVO.setDesignType(DesignTypeEnum.COLLECTION.getRealName());
+                    String url = collectionElement.getUrl();
+                    collectionElementVO.setOriginalUrl(url);
+                    if (minioUtil.doesObjectExist(url)) {
+                        collectionElementVO.setUrl(minioUtil.getPreSignedUrl(url, 24 * 60));
                     }
-                    List<CollectionElementVO> list = new ArrayList<>();
-                    for (CollectionElement collectionElement : collectionElements) {
-                        if (Objects.equals(collectionElement.getId(), Long.valueOf(collection.getMoodTemplateId()))) {
-                            continue;
-                        }
-                        CollectionElementVO collectionElementVO = CopyUtil.copyObject(collectionElement, CollectionElementVO.class);
-                        collectionElementVO.setDesignType(DesignTypeEnum.COLLECTION.getRealName());
-                        String url = collectionElement.getUrl();
-                        collectionElementVO.setOriginalUrl(url);
-                        if (minioUtil.doesObjectExist(url)) {
-                            collectionElementVO.setUrl(minioUtil.getPreSignedUrl(url, 24 * 60));
-                        }
-                        if (minioUtil.doesObjectExist(collectionElementVO.getOriginalUrl())) {
-                            list.add(collectionElementVO);
-                        }
+                    if (minioUtil.doesObjectExist(collectionElementVO.getOriginalUrl())) {
+                        list.add(collectionElementVO);
                     }
-                    moodBoardModuleChooseVO.setMoodBoards(list);
-                    moduleChooseVO.setMoodBoard(moodBoardModuleChooseVO);
                 }
+                moodBoardModuleChooseVO.setMoodBoards(list);
+                moduleChooseVO.setMoodBoard(moodBoardModuleChooseVO);
             }else if (module.equals(Module.printBoard.name())) {
 
                 QueryWrapper<CollectionElement> qw = new QueryWrapper<>();
@@ -1677,6 +1661,7 @@ public class UserLikeGroupServiceImpl extends ServiceImpl<UserLikeGroupMapper, U
                 CollectionElement compositeImage = collectionElementMapper.selectById(moodBoard.getMoodTemplateId());
                 if (compositeImage.getProjectId() == null) {
                     compositeImage.setProjectId(moduleSaveDTO.getProjectId());
+                    compositeImage.setIsCompositeImage(1);
                     collectionElementMapper.updateById(compositeImage);
                     if (!StringUtils.isEmpty(moodBoard.getMoodboardPosition())) {
                         // 合成图位置信息通过collectElementId关联（旧逻辑通过collectionId关联）