Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MeterSphere
metersphere
提交
056ea0ae
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,发现更多精彩内容 >>
提交
056ea0ae
编写于
10月 23, 2020
作者:
W
wenyann
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(消息设置):消息设置人员范围
上级
2c839b0d
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
27 addition
and
20 deletion
+27
-20
backend/src/main/java/io/metersphere/controller/UserController.java
...c/main/java/io/metersphere/controller/UserController.java
+5
-4
backend/src/main/java/io/metersphere/service/UserService.java
...end/src/main/java/io/metersphere/service/UserService.java
+0
-7
frontend/src/business/components/settings/organization/OrganizationMember.vue
...s/components/settings/organization/OrganizationMember.vue
+1
-1
frontend/src/business/components/settings/organization/TaskNotification.vue
...ess/components/settings/organization/TaskNotification.vue
+21
-8
未找到文件。
backend/src/main/java/io/metersphere/controller/UserController.java
浏览文件 @
056ea0ae
...
...
@@ -122,6 +122,11 @@ public class UserController {
Page
<
Object
>
page
=
PageHelper
.
startPage
(
goPage
,
pageSize
,
true
);
return
PageUtils
.
setPageInfo
(
page
,
userService
.
getOrgMemberList
(
request
));
}
@PostMapping
(
"/special/org/member/list"
)
@RequiresRoles
(
RoleConstants
.
ADMIN
)
public
List
<
User
>
_getOrgMemberListByAdmin
(
@RequestBody
QueryOrgMemberRequest
request
)
{
return
userService
.
getOrgMemberList
(
request
);
}
@PostMapping
(
"/special/org/member/list/all"
)
@RequiresRoles
(
RoleConstants
.
ADMIN
)
...
...
@@ -133,10 +138,6 @@ public class UserController {
public
List
<
User
>
getUserList
()
{
return
userService
.
getUserList
();
}
@GetMapping
(
"/list/orgId"
)
public
List
<
User
>
getUserListByOrgId
()
{
return
userService
.
getUserListByOrgId
();
}
@PostMapping
(
"/update/current"
)
public
UserDTO
updateCurrentUser
(
@RequestBody
User
user
)
{
userService
.
updateUser
(
user
);
...
...
backend/src/main/java/io/metersphere/service/UserService.java
浏览文件 @
056ea0ae
...
...
@@ -266,13 +266,6 @@ public class UserService {
example
.
setOrderByClause
(
"update_time desc"
);
return
userMapper
.
selectByExample
(
example
);
}
public
List
<
User
>
getUserListByOrgId
()
{
SessionUser
user
=
SessionUtils
.
getUser
();
String
orgId
=
user
.
getLastOrganizationId
();
UserExample
example
=
new
UserExample
();
example
.
createCriteria
().
andLastOrganizationIdEqualTo
(
orgId
);
return
userMapper
.
selectByExample
(
example
);
}
public
List
<
User
>
getUserListWithRequest
(
io
.
metersphere
.
controller
.
request
.
UserRequest
request
)
{
return
extUserMapper
.
getUserList
(
request
);
...
...
frontend/src/business/components/settings/organization/OrganizationMember.vue
浏览文件 @
056ea0ae
...
...
@@ -156,7 +156,7 @@
initTableData
()
{
let
param
=
{
name
:
this
.
condition
.
name
,
organizationId
:
this
.
currentUser
().
lastOrgani
zationId
organizationId
:
this
.
currentUser
().
lastOrgani
onIdzati
};
this
.
result
=
this
.
$post
(
this
.
buildPagePath
(
this
.
queryPath
),
param
,
response
=>
{
let
data
=
response
.
data
;
...
...
frontend/src/business/components/settings/organization/TaskNotification.vue
浏览文件 @
056ea0ae
...
...
@@ -504,26 +504,39 @@ export default {
})
},
userList
()
{
this
.
result
=
this
.
$get
(
'
user/list/orgId
'
,
response
=>
{
let
param
=
{
name
:
''
,
organizationId
:
this
.
currentUser
().
lastOrganizationId
};
this
.
result
=
this
.
$post
(
'
user/special/org/member/list
'
,
param
,
response
=>
{
this
.
jenkinsReceiverOptions
=
response
.
data
})
},
reviewUerList
()
{
this
.
result
=
this
.
$get
(
'
user/list/orgId
'
,
response
=>
{
let
param
=
{
name
:
''
,
organizationId
:
this
.
currentUser
().
lastOrganizationId
};
this
.
result
=
this
.
$post
(
'
user/special/org/member/list
'
,
param
,
response
=>
{
this
.
reviewReceiverOptions
=
response
.
data
})
},
defectUserList
()
{
this
.
result
=
this
.
$get
(
'
user/list/orgId
'
,
response
=>
{
let
param
=
{
name
:
''
,
organizationId
:
this
.
currentUser
().
lastOrganizationId
};
this
.
result
=
this
.
$post
(
'
user/special/org/member/list
'
,
param
,
response
=>
{
this
.
defectReceiverOptions
=
response
.
data
/* this.defectReceiverOptions.push({id: 'FOUNDER', name: this.$t('api_test.creator')}, {
id: 'EXECUTOR',
name: this.$t('test_track.plan_view.executor')
})*/
})
},
testPlanUserList
()
{
this
.
result
=
this
.
$get
(
'
user/list/orgId
'
,
response
=>
{
let
param
=
{
name
:
''
,
organizationId
:
this
.
currentUser
().
lastOrganizationId
};
this
.
result
=
this
.
$post
(
'
user/special/org/member/list
'
,
param
,
response
=>
{
this
.
testPlanReceiverOptions
=
response
.
data
})
},
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录