Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MeterSphere
metersphere
提交
e8db406d
M
metersphere
项目概览
MeterSphere
/
metersphere
上一次同步 大约 3 年
通知
25
Star
1
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
M
metersphere
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e8db406d
编写于
5月 27, 2020
作者:
S
shiziyuan9527
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
bug fix 修改组织的描述信息失败
上级
448dccdc
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
49 addition
and
19 deletion
+49
-19
backend/src/main/java/io/metersphere/service/OrganizationService.java
...main/java/io/metersphere/service/OrganizationService.java
+19
-4
backend/src/main/java/io/metersphere/service/WorkspaceService.java
...rc/main/java/io/metersphere/service/WorkspaceService.java
+30
-15
未找到文件。
backend/src/main/java/io/metersphere/service/OrganizationService.java
浏览文件 @
e8db406d
...
...
@@ -48,7 +48,7 @@ public class OrganizationService {
private
UserService
userService
;
public
Organization
addOrganization
(
Organization
organization
)
{
checkOrg
NameRepeat
(
organization
);
checkOrg
anization
(
organization
);
long
currentTimeMillis
=
System
.
currentTimeMillis
();
organization
.
setId
(
UUID
.
randomUUID
().
toString
());
organization
.
setCreateTime
(
currentTimeMillis
);
...
...
@@ -66,12 +66,27 @@ public class OrganizationService {
return
organizationMapper
.
selectByExample
(
example
);
}
private
void
checkOrg
NameRepeat
(
Organization
organization
)
{
private
void
checkOrg
anization
(
Organization
organization
)
{
if
(
StringUtils
.
isBlank
(
organization
.
getName
()))
{
MSException
.
throwException
(
Translator
.
get
(
"organization_name_is_null"
));
}
String
id
=
organization
.
getId
();
String
name
=
organization
.
getName
();
if
(
StringUtils
.
isNotBlank
(
id
))
{
Organization
org
=
organizationMapper
.
selectByPrimaryKey
(
id
);
if
(!
StringUtils
.
equals
(
org
.
getName
(),
name
))
{
checkOrgNameRepeat
(
name
);
}
}
else
{
checkOrgNameRepeat
(
name
);
}
}
public
void
checkOrgNameRepeat
(
String
orgName
)
{
OrganizationExample
organizationExample
=
new
OrganizationExample
();
organizationExample
.
createCriteria
().
andNameEqualTo
(
org
anization
.
getName
()
);
organizationExample
.
createCriteria
().
andNameEqualTo
(
org
Name
);
if
(
organizationMapper
.
countByExample
(
organizationExample
)
>
0
)
{
MSException
.
throwException
(
Translator
.
get
(
"organization_name_already_exists"
));
}
...
...
@@ -99,7 +114,7 @@ public class OrganizationService {
}
public
void
updateOrganization
(
Organization
organization
)
{
checkOrg
NameRepeat
(
organization
);
checkOrg
anization
(
organization
);
organization
.
setCreateTime
(
null
);
organization
.
setUpdateTime
(
System
.
currentTimeMillis
());
organizationMapper
.
updateByPrimaryKeySelective
(
organization
);
...
...
backend/src/main/java/io/metersphere/service/WorkspaceService.java
浏览文件 @
e8db406d
...
...
@@ -55,30 +55,39 @@ public class WorkspaceService {
MSException
.
throwException
(
Translator
.
get
(
"workspace_name_is_null"
));
}
// set organization id
workspace
.
setOrganizationId
(
SessionUtils
.
getCurrentOrganizationId
());
String
currentOrgId
=
SessionUtils
.
getCurrentOrganizationId
();
workspace
.
setOrganizationId
(
currentOrgId
);
long
currentTime
=
System
.
currentTimeMillis
();
WorkspaceExample
example
=
new
WorkspaceExample
();
example
.
createCriteria
()
.
andOrganizationIdEqualTo
(
SessionUtils
.
getCurrentOrganizationId
())
.
andNameEqualTo
(
workspace
.
getName
());
if
(
workspaceMapper
.
countByExample
(
example
)
>
0
)
{
MSException
.
throwException
(
Translator
.
get
(
"workspace_name_already_exists"
));
}
String
wsName
=
workspace
.
getName
();
if
(
StringUtils
.
isBlank
(
workspace
.
getId
()))
{
checkWsName
(
wsName
,
currentOrgId
);
workspace
.
setId
(
UUID
.
randomUUID
().
toString
());
workspace
.
setCreateTime
(
currentTime
);
workspace
.
setUpdateTime
(
currentTime
);
workspaceMapper
.
insertSelective
(
workspace
);
}
else
{
Workspace
ws
=
workspaceMapper
.
selectByPrimaryKey
(
workspace
.
getId
());
if
(!
StringUtils
.
equals
(
ws
.
getName
(),
wsName
))
{
checkWsName
(
wsName
,
currentOrgId
);
}
workspace
.
setUpdateTime
(
currentTime
);
workspaceMapper
.
updateByPrimaryKeySelective
(
workspace
);
}
return
workspace
;
}
public
void
checkWsName
(
String
wsName
,
String
orgId
)
{
WorkspaceExample
example
=
new
WorkspaceExample
();
example
.
createCriteria
()
.
andOrganizationIdEqualTo
(
orgId
)
.
andNameEqualTo
(
wsName
);
if
(
workspaceMapper
.
countByExample
(
example
)
>
0
)
{
MSException
.
throwException
(
Translator
.
get
(
"workspace_name_already_exists"
));
}
}
public
List
<
Workspace
>
getWorkspaceList
(
WorkspaceRequest
request
)
{
WorkspaceExample
example
=
new
WorkspaceExample
();
WorkspaceExample
.
Criteria
criteria
=
example
.
createCriteria
();
...
...
@@ -259,12 +268,18 @@ public class WorkspaceService {
if
(
StringUtils
.
isBlank
(
workspace
.
getOrganizationId
()))
{
MSException
.
throwException
(
Translator
.
get
(
"organization_id_is_null"
));
}
WorkspaceExample
example
=
new
WorkspaceExample
();
example
.
createCriteria
()
.
andOrganizationIdEqualTo
(
workspace
.
getOrganizationId
())
.
andNameEqualTo
(
workspace
.
getName
());
if
(
workspaceMapper
.
countByExample
(
example
)
>
0
)
{
MSException
.
throwException
(
Translator
.
get
(
"workspace_name_already_exists"
));
String
id
=
workspace
.
getId
();
String
orgId
=
workspace
.
getOrganizationId
();
String
name
=
workspace
.
getName
();
if
(
StringUtils
.
isNotBlank
(
id
))
{
Workspace
ws
=
workspaceMapper
.
selectByPrimaryKey
(
id
);
if
(!
StringUtils
.
equals
(
ws
.
getName
(),
name
))
{
checkWsName
(
name
,
orgId
);
}
}
else
{
checkWsName
(
name
,
orgId
);
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录