From 8720fc59923ca710f1fd3839c697b80655a0d380 Mon Sep 17 00:00:00 2001
From: shahaibo <1023316923@qq.com>
Date: Tue, 17 Oct 2023 10:29:08 +0800
Subject: [PATCH] =?UTF-8?q?BUGFIX:=20workspace=E6=A0=A1=E9=AA=8C=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CollectionElementServiceImpl.java   |  3 +++
 .../com/ai/da/service/impl/WorkspaceServiceImpl.java | 12 ++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java
index dfa64546..5b32f34e 100644
--- a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java
@@ -504,6 +504,9 @@ public class CollectionElementServiceImpl extends ServiceImpl<CollectionElementM
         }else {
             throw new BusinessException("templateId or modelType can't be null");
         }
+        if (StringUtils.isEmpty(designDTO.getModelSex())) {
+            throw new BusinessException("modelSex can't be null");
+        }
         elementVO.setModelSex(designDTO.getModelSex());
         return elementVO;
     }
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 1b5ea71d..6ab3f331 100644
--- a/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/WorkspaceServiceImpl.java
@@ -86,6 +86,7 @@ public class WorkspaceServiceImpl extends ServiceImpl<WorkspaceMapper, Workspace
         workspace.setIsLastIndex(null);
         AuthPrincipalVo userInfo = UserContext.getUserHolder();
         workspace.setUserName(userInfo.getUsername());
+        checkWorkspaceName(workspace.getId(), workspace.getWorkSpaceName(), userInfo.getUsername());
         if (null == workspace.getId()) {
             workspace.setIsLastIndex(0);
             QueryWrapper<SysFile> systemFemaleQw = new QueryWrapper<>();
@@ -121,6 +122,17 @@ public class WorkspaceServiceImpl extends ServiceImpl<WorkspaceMapper, Workspace
         }
     }
 
+    private void checkWorkspaceName(Long id, String workSpaceName, String userName) {
+        QueryWrapper<Workspace> qw = new QueryWrapper<>();
+        qw.lambda().ne(null != id, Workspace::getId, id);
+        qw.lambda().eq(Workspace::getWorkSpaceName, workSpaceName);
+        qw.lambda().eq(Workspace::getUserName, userName);
+        List<Workspace> workspaces = baseMapper.selectList(qw);
+        if (!CollectionUtils.isEmpty(workspaces)) {
+            throw new BusinessException("The workspace name already exists!");
+        }
+    }
+
     @Override
     public WorkspaceVO getPage(WorkspaceDTO query) {
         WorkspaceVO vo = new WorkspaceVO();