Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MeterSphere
metersphere
提交
08d669fe
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,发现更多精彩内容 >>
提交
08d669fe
编写于
2月 27, 2020
作者:
C
Captain.B
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'origin/dev' into dev
上级
a24d15f6
84c779ce
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
68 addition
and
2 deletion
+68
-2
backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserRoleMapper.java
...ava/io/metersphere/base/mapper/ext/ExtUserRoleMapper.java
+3
-0
backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserRoleMapper.xml
...java/io/metersphere/base/mapper/ext/ExtUserRoleMapper.xml
+8
-0
backend/src/main/java/io/metersphere/controller/UserController.java
...c/main/java/io/metersphere/controller/UserController.java
+3
-0
backend/src/main/java/io/metersphere/controller/UserRoleController.java
...in/java/io/metersphere/controller/UserRoleController.java
+23
-0
backend/src/main/java/io/metersphere/service/UserRoleService.java
...src/main/java/io/metersphere/service/UserRoleService.java
+22
-0
frontend/src/performance/components/settings/OrganizationMember.vue
...rc/performance/components/settings/OrganizationMember.vue
+9
-2
未找到文件。
backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserRoleMapper.java
浏览文件 @
08d669fe
package
io.metersphere.base.mapper.ext
;
import
io.metersphere.base.domain.Role
;
import
io.metersphere.base.domain.User
;
import
io.metersphere.controller.request.member.QueryMemberRequest
;
import
io.metersphere.controller.request.organization.QueryOrgMemberRequest
;
...
...
@@ -19,5 +20,7 @@ public interface ExtUserRoleMapper {
List
<
OrganizationMemberDTO
>
getOrganizationMemberDTO
(
@Param
(
"orgMember"
)
QueryOrgMemberRequest
request
);
List
<
Role
>
getOrganizationMemberRoles
(
@Param
(
"orgId"
)
String
orgId
,
@Param
(
"userId"
)
String
userId
);
}
backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserRoleMapper.xml
浏览文件 @
08d669fe
...
...
@@ -63,6 +63,14 @@
where o.id = #{orgMember.organizationId}
</select>
<select
id=
"getOrganizationMemberRoles"
resultType=
"io.metersphere.base.domain.Role"
>
select r.id, r.name
from organization o
join user_role ur on o.id = ur.source_id
join role r on r.id = ur.role_id
where o.id = #{orgId} and ur.user_id = #{userId}
</select>
</mapper>
\ No newline at end of file
backend/src/main/java/io/metersphere/controller/UserController.java
浏览文件 @
08d669fe
...
...
@@ -140,6 +140,9 @@ public class UserController {
return
PageUtils
.
setPageInfo
(
page
,
userService
.
getOrgMemberList
(
request
));
}
/**
* 查询组织成员列表 带角色信息
*/
@PostMapping
(
"/orgmemberdto/list/{goPage}/{pageSize}"
)
public
Pager
<
List
<
OrganizationMemberDTO
>>
getOrganizationMemberDTO
(
@PathVariable
int
goPage
,
@PathVariable
int
pageSize
,
@RequestBody
QueryOrgMemberRequest
request
)
{
Page
<
Object
>
page
=
PageHelper
.
startPage
(
goPage
,
pageSize
,
true
);
...
...
backend/src/main/java/io/metersphere/controller/UserRoleController.java
0 → 100644
浏览文件 @
08d669fe
package
io.metersphere.controller
;
import
io.metersphere.base.domain.Role
;
import
io.metersphere.service.UserRoleService
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.PathVariable
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
javax.annotation.Resource
;
import
java.util.List
;
@RequestMapping
(
"userrole"
)
@RestController
public
class
UserRoleController
{
@Resource
private
UserRoleService
userRoleService
;
@GetMapping
(
"/list/{orgId}/{userId}"
)
public
List
<
Role
>
getOrganizationMemberRoles
(
@PathVariable
String
orgId
,
@PathVariable
String
userId
)
{
return
userRoleService
.
getOrganizationMemberRoles
(
orgId
,
userId
);
}
}
backend/src/main/java/io/metersphere/service/UserRoleService.java
0 → 100644
浏览文件 @
08d669fe
package
io.metersphere.service
;
import
io.metersphere.base.domain.Role
;
import
io.metersphere.base.mapper.ext.ExtUserRoleMapper
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
javax.annotation.Resource
;
import
java.util.List
;
@Service
@Transactional
(
rollbackFor
=
Exception
.
class
)
public
class
UserRoleService
{
@Resource
private
ExtUserRoleMapper
extUserRoleMapper
;
public
List
<
Role
>
getOrganizationMemberRoles
(
String
orgId
,
String
userId
)
{
return
extUserRoleMapper
.
getOrganizationMemberRoles
(
orgId
,
userId
);
}
}
frontend/src/performance/components/settings/OrganizationMember.vue
浏览文件 @
08d669fe
...
...
@@ -85,7 +85,7 @@
btnTips
:
"
添加组织成员
"
,
createVisible
:
false
,
form
:
{},
queryPath
:
"
/user/orgmember
dto
/list
"
,
queryPath
:
"
/user/orgmember/list
"
,
condition
:
""
,
tableData
:
[],
rules
:
{
...
...
@@ -111,8 +111,15 @@
};
this
.
result
=
this
.
$post
(
this
.
buildPagePath
(
this
.
queryPath
),
param
,
response
=>
{
let
data
=
response
.
data
;
this
.
total
=
data
.
itemCount
;
this
.
tableData
=
data
.
listObject
;
let
url
=
"
/userrole/list/
"
+
this
.
currentUser
().
lastOrganizationId
;
for
(
let
i
=
0
;
i
<
this
.
tableData
.
length
;
i
++
)
{
this
.
$get
(
url
+
"
/
"
+
this
.
tableData
[
i
].
id
,
response
=>
{
let
roles
=
response
.
data
;
this
.
$set
(
this
.
tableData
[
i
],
"
roles
"
,
roles
);
})
}
this
.
total
=
data
.
itemCount
;
})
},
buildPagePath
(
path
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录