Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MeterSphere
metersphere
提交
2afa1bca
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,发现更多精彩内容 >>
提交
2afa1bca
编写于
2月 24, 2020
作者:
C
Captain.B
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
roles indexOf bug fix
上级
eeadaa2c
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
48 addition
and
11 deletion
+48
-11
backend/src/main/java/io/metersphere/controller/WorkspaceController.java
...n/java/io/metersphere/controller/WorkspaceController.java
+5
-2
backend/src/main/java/io/metersphere/controller/request/WorkspaceRequest.java
...a/io/metersphere/controller/request/WorkspaceRequest.java
+25
-0
backend/src/main/java/io/metersphere/service/WorkspaceService.java
...rc/main/java/io/metersphere/service/WorkspaceService.java
+11
-2
frontend/src/performance/components/HeaderUser.vue
frontend/src/performance/components/HeaderUser.vue
+6
-6
frontend/src/performance/components/settings/Workspace.vue
frontend/src/performance/components/settings/Workspace.vue
+1
-1
未找到文件。
backend/src/main/java/io/metersphere/controller/WorkspaceController.java
浏览文件 @
2afa1bca
...
...
@@ -6,7 +6,9 @@ import io.metersphere.base.domain.Workspace;
import
io.metersphere.commons.constants.RoleConstants
;
import
io.metersphere.commons.utils.PageUtils
;
import
io.metersphere.commons.utils.Pager
;
import
io.metersphere.controller.request.WorkspaceRequest
;
import
io.metersphere.service.WorkspaceService
;
import
io.metersphere.user.SessionUtils
;
import
org.apache.shiro.authz.annotation.RequiresRoles
;
import
org.springframework.web.bind.annotation.*
;
...
...
@@ -41,9 +43,10 @@ public class WorkspaceController {
@PostMapping
(
"list/{goPage}/{pageSize}"
)
@RequiresRoles
(
RoleConstants
.
ORG_ADMIN
)
public
Pager
<
List
<
Workspace
>>
getWorkspaceList
(
@PathVariable
int
goPage
,
@PathVariable
int
pageSize
)
{
public
Pager
<
List
<
Workspace
>>
getWorkspaceList
(
@PathVariable
int
goPage
,
@PathVariable
int
pageSize
,
@RequestBody
WorkspaceRequest
request
)
{
request
.
setOrganizationId
(
SessionUtils
.
getCurrentOrganizationId
());
Page
<
Object
>
page
=
PageHelper
.
startPage
(
goPage
,
pageSize
,
true
);
return
PageUtils
.
setPageInfo
(
page
,
workspaceService
.
getWorkspaceList
());
return
PageUtils
.
setPageInfo
(
page
,
workspaceService
.
getWorkspaceList
(
request
));
}
@GetMapping
(
"/list/userworkspace/{userId}"
)
...
...
backend/src/main/java/io/metersphere/controller/request/WorkspaceRequest.java
0 → 100644
浏览文件 @
2afa1bca
package
io.metersphere.controller.request
;
import
io.metersphere.commons.annotations.FuzzyQuery
;
public
class
WorkspaceRequest
{
private
String
organizationId
;
@FuzzyQuery
private
String
name
;
public
String
getOrganizationId
()
{
return
organizationId
;
}
public
void
setOrganizationId
(
String
organizationId
)
{
this
.
organizationId
=
organizationId
;
}
public
String
getName
()
{
return
name
;
}
public
void
setName
(
String
name
)
{
this
.
name
=
name
;
}
}
backend/src/main/java/io/metersphere/service/WorkspaceService.java
浏览文件 @
2afa1bca
...
...
@@ -7,6 +7,7 @@ import io.metersphere.base.mapper.WorkspaceMapper;
import
io.metersphere.base.mapper.ext.ExtUserRoleMapper
;
import
io.metersphere.commons.constants.RoleConstants
;
import
io.metersphere.commons.exception.MSException
;
import
io.metersphere.controller.request.WorkspaceRequest
;
import
io.metersphere.dto.UserRoleHelpDTO
;
import
io.metersphere.user.SessionUser
;
import
io.metersphere.user.SessionUtils
;
...
...
@@ -55,8 +56,16 @@ public class WorkspaceService {
return
workspace
;
}
public
List
<
Workspace
>
getWorkspaceList
()
{
return
workspaceMapper
.
selectByExample
(
null
);
public
List
<
Workspace
>
getWorkspaceList
(
WorkspaceRequest
request
)
{
WorkspaceExample
example
=
new
WorkspaceExample
();
WorkspaceExample
.
Criteria
criteria
=
example
.
createCriteria
();
if
(
StringUtils
.
isNotBlank
(
request
.
getOrganizationId
()))
{
criteria
.
andOrganizationIdEqualTo
(
request
.
getOrganizationId
());
}
if
(
StringUtils
.
isNotBlank
(
request
.
getName
()))
{
criteria
.
andNameLike
(
request
.
getName
());
}
return
workspaceMapper
.
selectByExample
(
example
);
}
public
void
deleteWorkspace
(
String
workspaceId
)
{
...
...
frontend/src/performance/components/HeaderUser.vue
浏览文件 @
2afa1bca
...
...
@@ -99,12 +99,12 @@
},
initMenuData
()
{
let
roles
=
this
.
currentUser
.
roles
.
map
(
r
=>
r
.
id
);
if
(
roles
.
indexOf
(
ROLE_ORG_ADMIN
)
>
0
)
{
if
(
roles
.
indexOf
(
ROLE_ORG_ADMIN
)
>
-
1
)
{
this
.
$get
(
"
/organization/list/userorg/
"
+
this
.
currentUserId
,
response
=>
{
this
.
organizationList
=
response
.
data
;
});
}
if
(
roles
.
indexOf
(
ROLE_TEST_MANAGER
)
>
0
||
roles
.
indexOf
(
ROLE_TEST_USER
)
>
0
||
roles
.
indexOf
(
ROLE_TEST_VIEWER
)
>
0
)
{
if
(
roles
.
indexOf
(
ROLE_TEST_MANAGER
)
>
-
1
||
roles
.
indexOf
(
ROLE_TEST_USER
)
>
-
1
||
roles
.
indexOf
(
ROLE_TEST_VIEWER
)
>
-
1
)
{
this
.
$get
(
"
/workspace/list/userworkspace/
"
+
this
.
currentUserId
,
response
=>
{
this
.
workspaceList
=
response
.
data
;
this
.
workspaceIds
=
response
.
data
.
map
(
r
=>
r
.
id
);
...
...
@@ -124,10 +124,10 @@
let
user
=
{};
user
.
id
=
this
.
currentUserInfo
.
id
;
user
.
lastSourceId
=
data
.
id
;
this
.
$post
(
"
/user/switch/source/
"
+
user
.
lastSourceId
,
{},
response
=>
{
Cookies
.
set
(
TokenKey
,
response
.
data
);
window
.
location
.
reload
();
})
this
.
$post
(
"
/user/switch/source/
"
+
user
.
lastSourceId
,
{},
response
=>
{
Cookies
.
set
(
TokenKey
,
response
.
data
);
window
.
location
.
reload
();
})
}
}
...
...
frontend/src/performance/components/settings/Workspace.vue
浏览文件 @
2afa1bca
...
...
@@ -118,7 +118,7 @@
},
list
()
{
let
url
=
'
/workspace/list/
'
+
this
.
currentPage
+
'
/
'
+
this
.
pageSize
;
this
.
result
=
this
.
$post
(
url
,
{},
response
=>
{
this
.
result
=
this
.
$post
(
url
,
{
name
:
this
.
condition
},
response
=>
{
let
data
=
response
.
data
;
this
.
items
=
data
.
listObject
;
this
.
total
=
data
.
itemCount
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录