Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MeterSphere
metersphere
提交
ce4c1b0a
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,发现更多精彩内容 >>
提交
ce4c1b0a
编写于
2月 27, 2020
作者:
C
Captain.B
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev
上级
e756e5ae
27b57dcb
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
151 addition
and
1 deletion
+151
-1
backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserRoleMapper.java
...ava/io/metersphere/base/mapper/ext/ExtUserRoleMapper.java
+5
-0
backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserRoleMapper.xml
...java/io/metersphere/base/mapper/ext/ExtUserRoleMapper.xml
+27
-0
backend/src/main/java/io/metersphere/controller/UserController.java
...c/main/java/io/metersphere/controller/UserController.java
+7
-0
backend/src/main/java/io/metersphere/dto/OrganizationMemberDTO.java
...c/main/java/io/metersphere/dto/OrganizationMemberDTO.java
+98
-0
backend/src/main/java/io/metersphere/service/UserService.java
...end/src/main/java/io/metersphere/service/UserService.java
+5
-0
frontend/src/performance/components/settings/OrganizationMember.vue
...rc/performance/components/settings/OrganizationMember.vue
+9
-1
未找到文件。
backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserRoleMapper.java
浏览文件 @
ce4c1b0a
...
...
@@ -3,6 +3,7 @@ package io.metersphere.base.mapper.ext;
import
io.metersphere.base.domain.User
;
import
io.metersphere.controller.request.member.QueryMemberRequest
;
import
io.metersphere.controller.request.organization.QueryOrgMemberRequest
;
import
io.metersphere.dto.OrganizationMemberDTO
;
import
io.metersphere.dto.UserRoleHelpDTO
;
import
org.apache.ibatis.annotations.Param
;
...
...
@@ -15,4 +16,8 @@ public interface ExtUserRoleMapper {
List
<
User
>
getMemberList
(
@Param
(
"member"
)
QueryMemberRequest
request
);
List
<
User
>
getOrgMemberList
(
@Param
(
"orgMember"
)
QueryOrgMemberRequest
request
);
List
<
OrganizationMemberDTO
>
getOrganizationMemberDTO
(
@Param
(
"orgMember"
)
QueryOrgMemberRequest
request
);
}
backend/src/main/java/io/metersphere/base/mapper/ext/ExtUserRoleMapper.xml
浏览文件 @
ce4c1b0a
...
...
@@ -2,6 +2,21 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper
namespace=
"io.metersphere.base.mapper.ext.ExtUserRoleMapper"
>
<resultMap
id=
"BaseOrganizationMemberDTOMap"
type=
"io.metersphere.dto.OrganizationMemberDTO"
>
<id
column=
"id"
jdbcType=
"VARCHAR"
property=
"id"
/>
<result
column=
"name"
jdbcType=
"VARCHAR"
property=
"name"
/>
<result
column=
"email"
jdbcType=
"VARCHAR"
property=
"email"
/>
<result
column=
"phone"
jdbcType=
"VARCHAR"
property=
"phone"
/>
<result
column=
"status"
jdbcType=
"VARCHAR"
property=
"status"
/>
<result
column=
"create_time"
jdbcType=
"BIGINT"
property=
"createTime"
/>
<result
column=
"update_time"
jdbcType=
"BIGINT"
property=
"updateTime"
/>
<result
column=
"language"
jdbcType=
"VARCHAR"
property=
"language"
/>
<collection
property=
"roles"
ofType=
"io.metersphere.base.domain.Role"
>
<id
column=
"rid"
jdbcType=
"VARCHAR"
property=
"id"
/>
<result
column=
"rname"
jdbcType=
"VARCHAR"
property=
"name"
/>
</collection>
</resultMap>
<select
id=
"getUserRoleHelpList"
parameterType=
"java.lang.String"
resultType=
"io.metersphere.dto.UserRoleHelpDTO"
>
SELECT
...
...
@@ -38,4 +53,16 @@
</if>
</select>
<select
id=
"getOrganizationMemberDTO"
resultMap=
"BaseOrganizationMemberDTOMap"
>
select u.id, u.name, u.email, u.language, u.create_time, u.update_time, u.phone,
o.id, o.name, ur.id, r.id as rid, r.name as rname
from organization o
join user_role ur on o.id = ur.source_id
join user u on ur.user_id = u.id
join role r on r.id = ur.role_id
where o.id = #{orgMember.organizationId}
</select>
</mapper>
\ No newline at end of file
backend/src/main/java/io/metersphere/controller/UserController.java
浏览文件 @
ce4c1b0a
...
...
@@ -10,6 +10,7 @@ import io.metersphere.controller.request.member.AddMemberRequest;
import
io.metersphere.controller.request.member.QueryMemberRequest
;
import
io.metersphere.controller.request.organization.AddOrgMemberRequest
;
import
io.metersphere.controller.request.organization.QueryOrgMemberRequest
;
import
io.metersphere.dto.OrganizationMemberDTO
;
import
io.metersphere.dto.UserDTO
;
import
io.metersphere.dto.UserRoleDTO
;
import
io.metersphere.service.UserService
;
...
...
@@ -139,4 +140,10 @@ 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
);
return
PageUtils
.
setPageInfo
(
page
,
userService
.
getOrganizationMemberDTO
(
request
));
}
}
backend/src/main/java/io/metersphere/dto/OrganizationMemberDTO.java
0 → 100644
浏览文件 @
ce4c1b0a
package
io.metersphere.dto
;
import
io.metersphere.base.domain.Role
;
import
java.util.ArrayList
;
import
java.util.List
;
public
class
OrganizationMemberDTO
{
private
String
id
;
private
String
name
;
private
String
email
;
private
String
phone
;
private
String
status
;
private
Long
createTime
;
private
Long
updateTime
;
private
String
language
;
private
List
<
Role
>
roles
=
new
ArrayList
<>();
public
List
<
Role
>
getRoles
()
{
return
roles
;
}
public
void
setRoles
(
List
<
Role
>
roles
)
{
this
.
roles
=
roles
;
}
public
String
getId
()
{
return
id
;
}
public
void
setId
(
String
id
)
{
this
.
id
=
id
;
}
public
String
getName
()
{
return
name
;
}
public
void
setName
(
String
name
)
{
this
.
name
=
name
;
}
public
String
getEmail
()
{
return
email
;
}
public
void
setEmail
(
String
email
)
{
this
.
email
=
email
;
}
public
String
getPhone
()
{
return
phone
;
}
public
void
setPhone
(
String
phone
)
{
this
.
phone
=
phone
;
}
public
String
getStatus
()
{
return
status
;
}
public
void
setStatus
(
String
status
)
{
this
.
status
=
status
;
}
public
Long
getCreateTime
()
{
return
createTime
;
}
public
void
setCreateTime
(
Long
createTime
)
{
this
.
createTime
=
createTime
;
}
public
Long
getUpdateTime
()
{
return
updateTime
;
}
public
void
setUpdateTime
(
Long
updateTime
)
{
this
.
updateTime
=
updateTime
;
}
public
String
getLanguage
()
{
return
language
;
}
public
void
setLanguage
(
String
language
)
{
this
.
language
=
language
;
}
}
backend/src/main/java/io/metersphere/service/UserService.java
浏览文件 @
ce4c1b0a
...
...
@@ -10,6 +10,7 @@ import io.metersphere.controller.request.member.AddMemberRequest;
import
io.metersphere.controller.request.member.QueryMemberRequest
;
import
io.metersphere.controller.request.organization.AddOrgMemberRequest
;
import
io.metersphere.controller.request.organization.QueryOrgMemberRequest
;
import
io.metersphere.dto.OrganizationMemberDTO
;
import
io.metersphere.dto.UserDTO
;
import
io.metersphere.dto.UserRoleDTO
;
import
io.metersphere.dto.UserRoleHelpDTO
;
...
...
@@ -306,4 +307,8 @@ public class UserService {
example
.
createCriteria
().
andIdEqualTo
(
userId
).
andPasswordEqualTo
(
CodingUtil
.
md5
(
password
));
return
userMapper
.
countByExample
(
example
)
>
0
;
}
public
List
<
OrganizationMemberDTO
>
getOrganizationMemberDTO
(
QueryOrgMemberRequest
request
)
{
return
extUserRoleMapper
.
getOrganizationMemberDTO
(
request
);
}
}
frontend/src/performance/components/settings/OrganizationMember.vue
浏览文件 @
ce4c1b0a
...
...
@@ -16,6 +16,14 @@
<el-table-column
prop=
"name"
label=
"用户名"
/>
<el-table-column
prop=
"email"
label=
"邮箱"
/>
<el-table-column
prop=
"phone"
label=
"电话"
/>
<el-table-column
prop=
"roles"
label=
"角色"
width=
"140"
>
<template
slot-scope=
"scope"
>
<el-tag
v-for=
"(role, index) in scope.row.roles"
:key=
"index"
size=
"mini"
effect=
"dark"
>
{{
role
.
name
}}
</el-tag>
</
template
>
</el-table-column>
<el-table-column>
<
template
slot-scope=
"scope"
>
<el-button
@
click=
"del(scope.row)"
type=
"danger"
icon=
"el-icon-delete"
size=
"mini"
circle
/>
...
...
@@ -77,7 +85,7 @@
btnTips
:
"
添加组织成员
"
,
createVisible
:
false
,
form
:
{},
queryPath
:
"
/user/orgmember/list
"
,
queryPath
:
"
/user/orgmember
dto
/list
"
,
condition
:
""
,
tableData
:
[],
rules
:
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录