From b1b465a05a21ffd8017c9def5a8484837e9e73f0 Mon Sep 17 00:00:00 2001
From: xupei <xupei3360@163.com>
Date: Fri, 26 Sep 2025 16:47:03 +0800
Subject: [PATCH] =?UTF-8?q?BUGFIX:1.=20=E5=8D=95=E5=93=81=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E8=BF=94=E5=9B=9E=E7=9A=84=E4=BC=98=E5=85=88=E7=BA=A7?=
 =?UTF-8?q?=E4=B8=8D=E5=AF=B9=202.=20=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BC=9A=E5=AF=BC=E8=87=B4=E5=A4=9A=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E6=A8=A1=E7=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ai/da/service/impl/DesignServiceImpl.java |  4 +-
 .../da/service/impl/WorkspaceServiceImpl.java | 44 ++++++++++++-------
 2 files changed, 32 insertions(+), 16 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 28d666d6..d79756aa 100644
--- a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java
@@ -1425,7 +1425,9 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
         }
 
         // 为没有优先级的衣服添加优先级
-        designItemDetailService.setDesignItemDetailPriority(designItemDetails);
+        if (!StringUtil.isNullOrEmpty(design.getSingleOverall()) && design.getSingleOverall().equals("overall")){
+            designItemDetailService.setDesignItemDetailPriority(designItemDetails);
+        }
 
         // 2、组装返回参数
         DesignItemDetailVO response = new DesignItemDetailVO();
diff --git a/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java b/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
index 51392209..330089d9 100644
--- a/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
@@ -727,22 +727,25 @@ public class WorkspaceServiceImpl extends ServiceImpl<WorkspaceMapper, Workspace
                                 deleteSketchByProjectId(projectId);
                             }
                         }
+                        // 判断当前使用的模特风格与新的模特风格是否一致
                         SysFile sysFile = sysFileService.getOneBySex(projectDTO.getStyleId(), projectDTO.getWorkspace().getSex(), projectDTO.getWorkspace().getAgeGroup());
-                        CollectionElement collectionElement = new CollectionElement();
-                        collectionElement.setAccountId(userInfo.getId());
-                        collectionElement.setProjectId(projectId);
-                        collectionElement.setLevel1Type(CollectionLevel1TypeEnum.MODEL.getRealName());
-                        collectionElement.setName(sysFile.getName());
-                        collectionElement.setUrl(sysFile.getUrl());
-                        collectionElement.setMd5(sysFile.getMd5());
-                        collectionElement.setCreateDate(new Date());
-                        collectionElement.setHasPin((byte) 0);
-                        collectionElementMapper.insert(collectionElement);
-                        CollectionElementRelModel collectionElementRelModel = new CollectionElementRelModel();
-                        collectionElementRelModel.setCollectionElementId(collectionElement.getId());
-                        collectionElementRelModel.setRelationId(sysFile.getId());
-                        collectionElementRelModel.setRelationType("System");
-                        collectionElementRelModelMapper.insert(collectionElementRelModel);
+                        if (!checkIfModelExistsInProject(sysFile.getMd5(), projectId)){
+                            CollectionElement collectionElement = new CollectionElement();
+                            collectionElement.setAccountId(userInfo.getId());
+                            collectionElement.setProjectId(projectId);
+                            collectionElement.setLevel1Type(CollectionLevel1TypeEnum.MODEL.getRealName());
+                            collectionElement.setName(sysFile.getName());
+                            collectionElement.setUrl(sysFile.getUrl());
+                            collectionElement.setMd5(sysFile.getMd5());
+                            collectionElement.setCreateDate(new Date());
+                            collectionElement.setHasPin((byte) 0);
+                            collectionElementMapper.insert(collectionElement);
+                            CollectionElementRelModel collectionElementRelModel = new CollectionElementRelModel();
+                            collectionElementRelModel.setCollectionElementId(collectionElement.getId());
+                            collectionElementRelModel.setRelationId(sysFile.getId());
+                            collectionElementRelModel.setRelationType("System");
+                            collectionElementRelModelMapper.insert(collectionElementRelModel);
+                        }
                     }
                     workspaceNew.setId(workspace.getId());
                     workspace.setUpdateTime(LocalDateTime.now());
@@ -855,6 +858,17 @@ public class WorkspaceServiceImpl extends ServiceImpl<WorkspaceMapper, Workspace
         collectionElementMapper.delete(qw);
     }
 
+    // 由于在数据库中表设计问题，目前只能通过路径来判断项目中是否存在某一个模特
+    public Boolean checkIfModelExistsInProject(String md5, Long projectId){
+        QueryWrapper<CollectionElement> qw = new QueryWrapper<>();
+        qw.lambda().eq(CollectionElement::getProjectId, projectId)
+                .eq(CollectionElement::getLevel1Type, CollectionLevel1TypeEnum.MODEL.getRealName())
+                .eq(CollectionElement::getMd5, md5);
+
+        List<CollectionElement> collectionElements = collectionElementMapper.selectList(qw);
+        return collectionElements != null && !collectionElements.isEmpty();
+    }
+
     @Override
     public Long getByProjectId(Long projectId) {
         QueryWrapper<Workspace> qw = new QueryWrapper<>();