From d3b4d15df8f04b64a639ac49b1017705ae86d911 Mon Sep 17 00:00:00 2001
From: shahaibo <1023316923@qq.com>
Date: Fri, 23 May 2025 16:33:43 +0800
Subject: [PATCH] =?UTF-8?q?TASK:mannequin=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../da/service/impl/WorkspaceServiceImpl.java | 121 +++++++++---------
 1 file changed, 62 insertions(+), 59 deletions(-)

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 eda5d7aa..3d9450f2 100644
--- a/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
@@ -694,47 +694,48 @@ public class WorkspaceServiceImpl extends ServiceImpl<WorkspaceMapper, Workspace
                 projectMapper.updateById(project);
             }
 
-            QueryWrapper<Workspace> qw = new QueryWrapper<>();
-            qw.lambda().eq(Workspace::getProjectId, projectDTO.getId());
-            List<Workspace> workspaces = workspaceMapper.selectList(qw);
-            if (CollectionUtils.isEmpty(workspaces)) {
-                throw new BusinessException("Lack of associated workspace.");
-            }else {
-                Workspace workspace = workspaces.get(0);
-                Workspace workspaceNew = CopyUtil.copyObject(projectDTO.getWorkspace(), Workspace.class);
-                workspaceNew.setId(workspace.getId());
-                workspace.setUpdateTime(LocalDateTime.now());
-                workspaceMapper.updateById(workspaceNew);
-            }
-
-            if (projectDTO.getStyleId() != null) {
-                QueryWrapper<WorkspaceRelStyle> wRSQW = new QueryWrapper<>();
-                wRSQW.lambda().eq(WorkspaceRelStyle::getWorkspaceId, projectDTO.getWorkspace().getId());
-                List<WorkspaceRelStyle> workspaceRelStyles = workspaceRelStyleMapper.selectList(wRSQW);
-                if (CollectionUtils.isEmpty(workspaceRelStyles)) {
-                    WorkspaceRelStyle rel = new WorkspaceRelStyle();
-                    rel.setWorkspaceId(projectDTO.getWorkspace().getId());
-                    rel.setStyleId(projectDTO.getStyleId());
-                    workspaceRelStyleMapper.insert(rel);
+            if (Objects.nonNull(projectDTO.getWorkspace())) {
+                QueryWrapper<Workspace> qw = new QueryWrapper<>();
+                qw.lambda().eq(Workspace::getProjectId, projectDTO.getId());
+                List<Workspace> workspaces = workspaceMapper.selectList(qw);
+                if (CollectionUtils.isEmpty(workspaces)) {
+                    throw new BusinessException("Lack of associated workspace.");
                 }else {
-                    WorkspaceRelStyle workspaceRelStyleOld = workspaceRelStyles.get(0);
-                    if (!Objects.equals(workspaceRelStyleOld.getStyleId(), projectDTO.getStyleId())) {
-                        workspaceRelStyleOld.setStyleId(projectDTO.getStyleId());
-                        workspaceRelStyleMapper.updateById(workspaceRelStyleOld);
+                    Workspace workspace = workspaces.get(0);
+                    Workspace workspaceNew = CopyUtil.copyObject(projectDTO.getWorkspace(), Workspace.class);
+                    workspaceNew.setId(workspace.getId());
+                    workspace.setUpdateTime(LocalDateTime.now());
+                    workspaceMapper.updateById(workspaceNew);
+                }
+                if (projectDTO.getStyleId() != null) {
+                    QueryWrapper<WorkspaceRelStyle> wRSQW = new QueryWrapper<>();
+                    wRSQW.lambda().eq(WorkspaceRelStyle::getWorkspaceId, projectDTO.getWorkspace().getId());
+                    List<WorkspaceRelStyle> workspaceRelStyles = workspaceRelStyleMapper.selectList(wRSQW);
+                    if (CollectionUtils.isEmpty(workspaceRelStyles)) {
+                        WorkspaceRelStyle rel = new WorkspaceRelStyle();
+                        rel.setWorkspaceId(projectDTO.getWorkspace().getId());
+                        rel.setStyleId(projectDTO.getStyleId());
+                        workspaceRelStyleMapper.insert(rel);
+                    }else {
+                        WorkspaceRelStyle workspaceRelStyleOld = workspaceRelStyles.get(0);
+                        if (!Objects.equals(workspaceRelStyleOld.getStyleId(), projectDTO.getStyleId())) {
+                            workspaceRelStyleOld.setStyleId(projectDTO.getStyleId());
+                            workspaceRelStyleMapper.updateById(workspaceRelStyleOld);
+                        }
+                    }
+                }else {
+                    QueryWrapper<WorkspaceRelStyle> wRSQW = new QueryWrapper<>();
+                    wRSQW.lambda().eq(WorkspaceRelStyle::getWorkspaceId, projectDTO.getWorkspace().getId());
+                    List<WorkspaceRelStyle> workspaceRelStyles = workspaceRelStyleMapper.selectList(wRSQW);
+                    if (!CollectionUtils.isEmpty(workspaceRelStyles)) {
+                        workspaceRelStyleMapper.deleteBatchIds(workspaceRelStyles);
                     }
                 }
-            }else {
-                QueryWrapper<WorkspaceRelStyle> wRSQW = new QueryWrapper<>();
-                wRSQW.lambda().eq(WorkspaceRelStyle::getWorkspaceId, projectDTO.getWorkspace().getId());
-                List<WorkspaceRelStyle> workspaceRelStyles = workspaceRelStyleMapper.selectList(wRSQW);
-                if (!CollectionUtils.isEmpty(workspaceRelStyles)) {
-                    workspaceRelStyleMapper.deleteBatchIds(workspaceRelStyles);
-                }
+                Long workspaceId = workspaceService.getByProjectId(projectId);
+                WorkspaceVO byIdForProject = workspaceService.getByIdForProject(workspaceId);
+                vo.setWorkspaceVO(byIdForProject);
             }
-            Long workspaceId = workspaceService.getByProjectId(projectId);
-            WorkspaceVO byIdForProject = workspaceService.getByIdForProject(workspaceId);
             vo.setId(projectId);
-            vo.setWorkspaceVO(byIdForProject);
             return vo;
         }else {
             Project project = CopyUtil.copyObject(projectDTO, Project.class);
@@ -744,36 +745,38 @@ public class WorkspaceServiceImpl extends ServiceImpl<WorkspaceMapper, Workspace
             project.setUpdateTime(now);
             projectMapper.insert(project);
 
-            Workspace workspace = CopyUtil.copyObject(projectDTO.getWorkspace(), Workspace.class);
-            workspace.setIsLastIndex(0);
-            workspace.setAccountId(userInfo.getId());
-            workspace.setProjectId(project.getId());
-            workspace.setCreateTime(LocalDateTime.now());
-            workspace.setUpdateTime(LocalDateTime.now());
+            if (Objects.nonNull(projectDTO.getWorkspace())) {
+                Workspace workspace = CopyUtil.copyObject(projectDTO.getWorkspace(), Workspace.class);
+                workspace.setIsLastIndex(0);
+                workspace.setAccountId(userInfo.getId());
+                workspace.setProjectId(project.getId());
+                workspace.setCreateTime(LocalDateTime.now());
+                workspace.setUpdateTime(LocalDateTime.now());
 
-            if (projectDTO.getProcess().equals(DesignProcess.SERIES_DESIGN.name()) || projectDTO.getProcess().equals(DesignProcess.SKETCH_COLLAGE_PROCESS.name())) {
-                SysFile sysFile = sysFileService.getOneBySex(projectDTO.getStyleId(), projectDTO.getWorkspace().getSex(), projectDTO.getWorkspace().getAgeGroup());
+                if (projectDTO.getProcess().equals(DesignProcess.SERIES_DESIGN.name()) || projectDTO.getProcess().equals(DesignProcess.SKETCH_COLLAGE_PROCESS.name())) {
+                    SysFile sysFile = sysFileService.getOneBySex(projectDTO.getStyleId(), projectDTO.getWorkspace().getSex(), projectDTO.getWorkspace().getAgeGroup());
 
-                if (projectDTO.getWorkspace().getSex().equals(Sex.FEMALE.getValue())) {
-                    workspace.setMannequinFemaleId(sysFile.getId());
-                    workspace.setMannequinFemaleType("System");
-                }else {
-                    workspace.setMannequinMaleId(sysFile.getId());
-                    workspace.setMannequinMaleType("System");
+                    if (projectDTO.getWorkspace().getSex().equals(Sex.FEMALE.getValue())) {
+                        workspace.setMannequinFemaleId(sysFile.getId());
+                        workspace.setMannequinFemaleType("System");
+                    }else {
+                        workspace.setMannequinMaleId(sysFile.getId());
+                        workspace.setMannequinMaleType("System");
+                    }
                 }
-            }
 
-            workspaceMapper.insert(workspace);
+                workspaceMapper.insert(workspace);
 
-            if (projectDTO.getStyleId() != null) {
-                WorkspaceRelStyle rel = new WorkspaceRelStyle();
-                rel.setWorkspaceId(workspace.getId());
-                rel.setStyleId(projectDTO.getStyleId());
-                workspaceRelStyleMapper.insert(rel);
+                if (projectDTO.getStyleId() != null) {
+                    WorkspaceRelStyle rel = new WorkspaceRelStyle();
+                    rel.setWorkspaceId(workspace.getId());
+                    rel.setStyleId(projectDTO.getStyleId());
+                    workspaceRelStyleMapper.insert(rel);
+                }
+                WorkspaceVO byIdForProject = workspaceService.getByIdForProject(workspace.getId());
+                vo.setWorkspaceVO(byIdForProject);
             }
-            WorkspaceVO byIdForProject = workspaceService.getByIdForProject(workspace.getId());
             vo.setId(project.getId());
-            vo.setWorkspaceVO(byIdForProject);
             return vo;
         }
     }