test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(系统设置): 创建项目接口工作空间ID为空可成功创建 

--bug=1015603 --user=李玉号 【系统设置】创建项目接口工作空间ID为空可成功创建
https://www.tapd.cn/55049933/s/1217342
This commit is contained in:
shiziyuan9527 2022-08-02 14:49:14 +08:00 committed by shiziyuan9527
parent 58ed3ec564
commit a624265526
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
backend/src/main/java/io/metersphere/service/ProjectService.java
View File

@ -128,18 +128,11 @@ public class ProjectService {
private ApiScenarioReportStructureMapper apiScenarioReportStructureMapper;
@Resource
private ApiScenarioReportResultMapper apiScenarioReportResultMapper;
@Resource
private WorkspaceMapper workspaceMapper;
public Project addProject(AddProjectRequest project) {
if (StringUtils.isBlank(project.getName())) {
MSException.throwException(Translator.get("project_name_is_null"));
}
ProjectExample example = new ProjectExample();
example.createCriteria()
.andWorkspaceIdEqualTo(project.getWorkspaceId())
.andNameEqualTo(project.getName());
if (projectMapper.countByExample(example) > 0) {
MSException.throwException(Translator.get("project_name_already_exists"));
}
this.checkCreateProjectParam(project);
QuotaService quotaService = CommonBeanFactory.getBean(QuotaService.class);
if (quotaService != null) {
@ -195,6 +188,29 @@ public class ProjectService {
return project;
}
private void checkCreateProjectParam(AddProjectRequest project) {
String name = project.getName();
if (StringUtils.isBlank(name)) {
MSException.throwException(Translator.get("project_name_is_null"));
}
String workspaceId = project.getWorkspaceId();
if (StringUtils.isBlank(workspaceId)) {
MSException.throwException("project workspace_id is null");
}
Workspace workspace = workspaceMapper.selectByPrimaryKey(workspaceId);
if (workspace == null) {
MSException.throwException("project workspace_id is not exist.");
}
ProjectExample example = new ProjectExample();
example.createCriteria().andWorkspaceIdEqualTo(workspaceId).andNameEqualTo(name);
if (projectMapper.countByExample(example) > 0) {
MSException.throwException(Translator.get("project_name_already_exists"));
}
}
public void addProjectVersion(Project project) {
ProjectVersion projectVersion = new ProjectVersion();
projectVersion.setId(UUID.randomUUID().toString());