Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MeterSphere
metersphere
提交
bfa3ef70
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,发现更多精彩内容 >>
提交
bfa3ef70
编写于
2月 25, 2020
作者:
C
Captain.B
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
table use changed
上级
2afa1bca
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
205 addition
and
124 deletion
+205
-124
backend/src/main/java/io/metersphere/base/domain/User.java
backend/src/main/java/io/metersphere/base/domain/User.java
+20
-10
backend/src/main/java/io/metersphere/base/domain/UserExample.java
...src/main/java/io/metersphere/base/domain/UserExample.java
+126
-56
backend/src/main/java/io/metersphere/base/mapper/UserMapper.xml
...d/src/main/java/io/metersphere/base/mapper/UserMapper.xml
+38
-22
backend/src/main/java/io/metersphere/dto/UserDTO.java
backend/src/main/java/io/metersphere/dto/UserDTO.java
+19
-9
backend/src/main/java/io/metersphere/service/UserService.java
...end/src/main/java/io/metersphere/service/UserService.java
+2
-1
backend/src/main/java/io/metersphere/user/SessionUser.java
backend/src/main/java/io/metersphere/user/SessionUser.java
+0
-26
未找到文件。
backend/src/main/java/io/metersphere/base/domain/User.java
浏览文件 @
bfa3ef70
...
...
@@ -17,10 +17,12 @@ public class User implements Serializable {
private
Long
updateTime
;
private
String
lastSourceId
;
private
String
language
;
private
String
lastWorkspaceId
;
private
String
lastOrganizationId
;
private
static
final
long
serialVersionUID
=
1L
;
public
String
getId
()
{
...
...
@@ -79,14 +81,6 @@ public class User implements Serializable {
this
.
updateTime
=
updateTime
;
}
public
String
getLastSourceId
()
{
return
lastSourceId
;
}
public
void
setLastSourceId
(
String
lastSourceId
)
{
this
.
lastSourceId
=
lastSourceId
==
null
?
null
:
lastSourceId
.
trim
();
}
public
String
getLanguage
()
{
return
language
;
}
...
...
@@ -94,4 +88,20 @@ public class User implements Serializable {
public
void
setLanguage
(
String
language
)
{
this
.
language
=
language
==
null
?
null
:
language
.
trim
();
}
public
String
getLastWorkspaceId
()
{
return
lastWorkspaceId
;
}
public
void
setLastWorkspaceId
(
String
lastWorkspaceId
)
{
this
.
lastWorkspaceId
=
lastWorkspaceId
==
null
?
null
:
lastWorkspaceId
.
trim
();
}
public
String
getLastOrganizationId
()
{
return
lastOrganizationId
;
}
public
void
setLastOrganizationId
(
String
lastOrganizationId
)
{
this
.
lastOrganizationId
=
lastOrganizationId
==
null
?
null
:
lastOrganizationId
.
trim
();
}
}
\ No newline at end of file
backend/src/main/java/io/metersphere/base/domain/UserExample.java
浏览文件 @
bfa3ef70
...
...
@@ -574,143 +574,213 @@ public class UserExample {
return
(
Criteria
)
this
;
}
public
Criteria
andLa
stSourceId
IsNull
()
{
addCriterion
(
"la
st_source_id
is null"
);
public
Criteria
andLa
nguage
IsNull
()
{
addCriterion
(
"la
nguage
is null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLa
stSourceId
IsNotNull
()
{
addCriterion
(
"la
st_source_id
is not null"
);
public
Criteria
andLa
nguage
IsNotNull
()
{
addCriterion
(
"la
nguage
is not null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLa
stSourceId
EqualTo
(
String
value
)
{
addCriterion
(
"la
st_source_id ="
,
value
,
"lastSourceId
"
);
public
Criteria
andLa
nguage
EqualTo
(
String
value
)
{
addCriterion
(
"la
nguage ="
,
value
,
"language
"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLa
stSourceId
NotEqualTo
(
String
value
)
{
addCriterion
(
"la
st_source_id <>"
,
value
,
"lastSourceId
"
);
public
Criteria
andLa
nguage
NotEqualTo
(
String
value
)
{
addCriterion
(
"la
nguage <>"
,
value
,
"language
"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLa
stSourceId
GreaterThan
(
String
value
)
{
addCriterion
(
"la
st_source_id >"
,
value
,
"lastSourceId
"
);
public
Criteria
andLa
nguage
GreaterThan
(
String
value
)
{
addCriterion
(
"la
nguage >"
,
value
,
"language
"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLa
stSourceId
GreaterThanOrEqualTo
(
String
value
)
{
addCriterion
(
"la
st_source_id >="
,
value
,
"lastSourceId
"
);
public
Criteria
andLa
nguage
GreaterThanOrEqualTo
(
String
value
)
{
addCriterion
(
"la
nguage >="
,
value
,
"language
"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLa
stSourceId
LessThan
(
String
value
)
{
addCriterion
(
"la
st_source_id <"
,
value
,
"lastSourceId
"
);
public
Criteria
andLa
nguage
LessThan
(
String
value
)
{
addCriterion
(
"la
nguage <"
,
value
,
"language
"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLa
stSourceId
LessThanOrEqualTo
(
String
value
)
{
addCriterion
(
"la
st_source_id <="
,
value
,
"lastSourceId
"
);
public
Criteria
andLa
nguage
LessThanOrEqualTo
(
String
value
)
{
addCriterion
(
"la
nguage <="
,
value
,
"language
"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLa
stSourceId
Like
(
String
value
)
{
addCriterion
(
"la
st_source_id like"
,
value
,
"lastSourceId
"
);
public
Criteria
andLa
nguage
Like
(
String
value
)
{
addCriterion
(
"la
nguage like"
,
value
,
"language
"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLa
stSourceId
NotLike
(
String
value
)
{
addCriterion
(
"la
st_source_id not like"
,
value
,
"lastSourceId
"
);
public
Criteria
andLa
nguage
NotLike
(
String
value
)
{
addCriterion
(
"la
nguage not like"
,
value
,
"language
"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLa
stSourceId
In
(
List
<
String
>
values
)
{
addCriterion
(
"la
st_source_id in"
,
values
,
"lastSourceId
"
);
public
Criteria
andLa
nguage
In
(
List
<
String
>
values
)
{
addCriterion
(
"la
nguage in"
,
values
,
"language
"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLa
stSourceId
NotIn
(
List
<
String
>
values
)
{
addCriterion
(
"la
st_source_id not in"
,
values
,
"lastSourceId
"
);
public
Criteria
andLa
nguage
NotIn
(
List
<
String
>
values
)
{
addCriterion
(
"la
nguage not in"
,
values
,
"language
"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLa
stSourceId
Between
(
String
value1
,
String
value2
)
{
addCriterion
(
"la
st_source_id between"
,
value1
,
value2
,
"lastSourceId
"
);
public
Criteria
andLa
nguage
Between
(
String
value1
,
String
value2
)
{
addCriterion
(
"la
nguage between"
,
value1
,
value2
,
"language
"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLa
stSourceId
NotBetween
(
String
value1
,
String
value2
)
{
addCriterion
(
"la
st_source_id not between"
,
value1
,
value2
,
"lastSourceId
"
);
public
Criteria
andLa
nguage
NotBetween
(
String
value1
,
String
value2
)
{
addCriterion
(
"la
nguage not between"
,
value1
,
value2
,
"language
"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLa
nguage
IsNull
()
{
addCriterion
(
"la
nguage
is null"
);
public
Criteria
andLa
stWorkspaceId
IsNull
()
{
addCriterion
(
"la
st_workspace_id
is null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLa
nguage
IsNotNull
()
{
addCriterion
(
"la
nguage
is not null"
);
public
Criteria
andLa
stWorkspaceId
IsNotNull
()
{
addCriterion
(
"la
st_workspace_id
is not null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLa
nguage
EqualTo
(
String
value
)
{
addCriterion
(
"la
nguage ="
,
value
,
"language
"
);
public
Criteria
andLa
stWorkspaceId
EqualTo
(
String
value
)
{
addCriterion
(
"la
st_workspace_id ="
,
value
,
"lastWorkspaceId
"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLa
nguage
NotEqualTo
(
String
value
)
{
addCriterion
(
"la
nguage <>"
,
value
,
"language
"
);
public
Criteria
andLa
stWorkspaceId
NotEqualTo
(
String
value
)
{
addCriterion
(
"la
st_workspace_id <>"
,
value
,
"lastWorkspaceId
"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLa
nguage
GreaterThan
(
String
value
)
{
addCriterion
(
"la
nguage >"
,
value
,
"language
"
);
public
Criteria
andLa
stWorkspaceId
GreaterThan
(
String
value
)
{
addCriterion
(
"la
st_workspace_id >"
,
value
,
"lastWorkspaceId
"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLa
nguage
GreaterThanOrEqualTo
(
String
value
)
{
addCriterion
(
"la
nguage >="
,
value
,
"language
"
);
public
Criteria
andLa
stWorkspaceId
GreaterThanOrEqualTo
(
String
value
)
{
addCriterion
(
"la
st_workspace_id >="
,
value
,
"lastWorkspaceId
"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLa
nguage
LessThan
(
String
value
)
{
addCriterion
(
"la
nguage <"
,
value
,
"language
"
);
public
Criteria
andLa
stWorkspaceId
LessThan
(
String
value
)
{
addCriterion
(
"la
st_workspace_id <"
,
value
,
"lastWorkspaceId
"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLa
nguage
LessThanOrEqualTo
(
String
value
)
{
addCriterion
(
"la
nguage <="
,
value
,
"language
"
);
public
Criteria
andLa
stWorkspaceId
LessThanOrEqualTo
(
String
value
)
{
addCriterion
(
"la
st_workspace_id <="
,
value
,
"lastWorkspaceId
"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLa
nguage
Like
(
String
value
)
{
addCriterion
(
"la
nguage like"
,
value
,
"language
"
);
public
Criteria
andLa
stWorkspaceId
Like
(
String
value
)
{
addCriterion
(
"la
st_workspace_id like"
,
value
,
"lastWorkspaceId
"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLa
nguage
NotLike
(
String
value
)
{
addCriterion
(
"la
nguage not like"
,
value
,
"language
"
);
public
Criteria
andLa
stWorkspaceId
NotLike
(
String
value
)
{
addCriterion
(
"la
st_workspace_id not like"
,
value
,
"lastWorkspaceId
"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLa
nguage
In
(
List
<
String
>
values
)
{
addCriterion
(
"la
nguage in"
,
values
,
"language
"
);
public
Criteria
andLa
stWorkspaceId
In
(
List
<
String
>
values
)
{
addCriterion
(
"la
st_workspace_id in"
,
values
,
"lastWorkspaceId
"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLa
nguage
NotIn
(
List
<
String
>
values
)
{
addCriterion
(
"la
nguage not in"
,
values
,
"language
"
);
public
Criteria
andLa
stWorkspaceId
NotIn
(
List
<
String
>
values
)
{
addCriterion
(
"la
st_workspace_id not in"
,
values
,
"lastWorkspaceId
"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLa
nguage
Between
(
String
value1
,
String
value2
)
{
addCriterion
(
"la
nguage between"
,
value1
,
value2
,
"language
"
);
public
Criteria
andLa
stWorkspaceId
Between
(
String
value1
,
String
value2
)
{
addCriterion
(
"la
st_workspace_id between"
,
value1
,
value2
,
"lastWorkspaceId
"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLanguageNotBetween
(
String
value1
,
String
value2
)
{
addCriterion
(
"language not between"
,
value1
,
value2
,
"language"
);
public
Criteria
andLastWorkspaceIdNotBetween
(
String
value1
,
String
value2
)
{
addCriterion
(
"last_workspace_id not between"
,
value1
,
value2
,
"lastWorkspaceId"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLastOrganizationIdIsNull
()
{
addCriterion
(
"last_organization_id is null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLastOrganizationIdIsNotNull
()
{
addCriterion
(
"last_organization_id is not null"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLastOrganizationIdEqualTo
(
String
value
)
{
addCriterion
(
"last_organization_id ="
,
value
,
"lastOrganizationId"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLastOrganizationIdNotEqualTo
(
String
value
)
{
addCriterion
(
"last_organization_id <>"
,
value
,
"lastOrganizationId"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLastOrganizationIdGreaterThan
(
String
value
)
{
addCriterion
(
"last_organization_id >"
,
value
,
"lastOrganizationId"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLastOrganizationIdGreaterThanOrEqualTo
(
String
value
)
{
addCriterion
(
"last_organization_id >="
,
value
,
"lastOrganizationId"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLastOrganizationIdLessThan
(
String
value
)
{
addCriterion
(
"last_organization_id <"
,
value
,
"lastOrganizationId"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLastOrganizationIdLessThanOrEqualTo
(
String
value
)
{
addCriterion
(
"last_organization_id <="
,
value
,
"lastOrganizationId"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLastOrganizationIdLike
(
String
value
)
{
addCriterion
(
"last_organization_id like"
,
value
,
"lastOrganizationId"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLastOrganizationIdNotLike
(
String
value
)
{
addCriterion
(
"last_organization_id not like"
,
value
,
"lastOrganizationId"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLastOrganizationIdIn
(
List
<
String
>
values
)
{
addCriterion
(
"last_organization_id in"
,
values
,
"lastOrganizationId"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLastOrganizationIdNotIn
(
List
<
String
>
values
)
{
addCriterion
(
"last_organization_id not in"
,
values
,
"lastOrganizationId"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLastOrganizationIdBetween
(
String
value1
,
String
value2
)
{
addCriterion
(
"last_organization_id between"
,
value1
,
value2
,
"lastOrganizationId"
);
return
(
Criteria
)
this
;
}
public
Criteria
andLastOrganizationIdNotBetween
(
String
value1
,
String
value2
)
{
addCriterion
(
"last_organization_id not between"
,
value1
,
value2
,
"lastOrganizationId"
);
return
(
Criteria
)
this
;
}
}
...
...
backend/src/main/java/io/metersphere/base/mapper/UserMapper.xml
浏览文件 @
bfa3ef70
...
...
@@ -9,8 +9,9 @@
<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=
"last_source_id"
jdbcType=
"VARCHAR"
property=
"lastSourceId"
/>
<result
column=
"language"
jdbcType=
"VARCHAR"
property=
"language"
/>
<result
column=
"last_workspace_id"
jdbcType=
"VARCHAR"
property=
"lastWorkspaceId"
/>
<result
column=
"last_organization_id"
jdbcType=
"VARCHAR"
property=
"lastOrganizationId"
/>
</resultMap>
<sql
id=
"Example_Where_Clause"
>
<where>
...
...
@@ -71,7 +72,8 @@
</where>
</sql>
<sql
id=
"Base_Column_List"
>
id, name, email, phone, status, create_time, update_time, last_source_id, language
id, name, email, phone, status, create_time, update_time, language, last_workspace_id,
last_organization_id
</sql>
<select
id=
"selectByExample"
parameterType=
"io.metersphere.base.domain.UserExample"
resultMap=
"BaseResultMap"
>
select
...
...
@@ -106,12 +108,12 @@
<insert
id=
"insert"
parameterType=
"io.metersphere.base.domain.User"
>
insert into user (id, name, email,
phone, status, create_time,
update_time, la
st_source_id, language
)
update_time, la
nguage, last_workspace_id,
last_organization_id
)
values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{email,jdbcType=VARCHAR},
#{phone,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT},
#{updateTime,jdbcType=BIGINT}, #{la
stSourceId,jdbcType=VARCHAR}, #{language,jdbcType=VARCHAR}
)
#{updateTime,jdbcType=BIGINT}, #{la
nguage,jdbcType=VARCHAR}, #{lastWorkspaceId,jdbcType=VARCHAR},
#{lastOrganizationId,jdbcType=VARCHAR}
)
</insert>
<insert
id=
"insertSelective"
parameterType=
"io.metersphere.base.domain.User"
>
insert into user
...
...
@@ -137,12 +139,15 @@
<if
test=
"updateTime != null"
>
update_time,
</if>
<if
test=
"lastSourceId != null"
>
last_source_id,
</if>
<if
test=
"language != null"
>
language,
</if>
<if
test=
"lastWorkspaceId != null"
>
last_workspace_id,
</if>
<if
test=
"lastOrganizationId != null"
>
last_organization_id,
</if>
</trim>
<trim
prefix=
"values ("
suffix=
")"
suffixOverrides=
","
>
<if
test=
"id != null"
>
...
...
@@ -166,12 +171,15 @@
<if
test=
"updateTime != null"
>
#{updateTime,jdbcType=BIGINT},
</if>
<if
test=
"lastSourceId != null"
>
#{lastSourceId,jdbcType=VARCHAR},
</if>
<if
test=
"language != null"
>
#{language,jdbcType=VARCHAR},
</if>
<if
test=
"lastWorkspaceId != null"
>
#{lastWorkspaceId,jdbcType=VARCHAR},
</if>
<if
test=
"lastOrganizationId != null"
>
#{lastOrganizationId,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select
id=
"countByExample"
parameterType=
"io.metersphere.base.domain.UserExample"
resultType=
"java.lang.Long"
>
...
...
@@ -204,12 +212,15 @@
<if
test=
"record.updateTime != null"
>
update_time = #{record.updateTime,jdbcType=BIGINT},
</if>
<if
test=
"record.lastSourceId != null"
>
last_source_id = #{record.lastSourceId,jdbcType=VARCHAR},
</if>
<if
test=
"record.language != null"
>
language = #{record.language,jdbcType=VARCHAR},
</if>
<if
test=
"record.lastWorkspaceId != null"
>
last_workspace_id = #{record.lastWorkspaceId,jdbcType=VARCHAR},
</if>
<if
test=
"record.lastOrganizationId != null"
>
last_organization_id = #{record.lastOrganizationId,jdbcType=VARCHAR},
</if>
</set>
<if
test=
"_parameter != null"
>
<include
refid=
"Update_By_Example_Where_Clause"
/>
...
...
@@ -224,8 +235,9 @@
status = #{record.status,jdbcType=VARCHAR},
create_time = #{record.createTime,jdbcType=BIGINT},
update_time = #{record.updateTime,jdbcType=BIGINT},
last_source_id = #{record.lastSourceId,jdbcType=VARCHAR},
language = #{record.language,jdbcType=VARCHAR}
language = #{record.language,jdbcType=VARCHAR},
last_workspace_id = #{record.lastWorkspaceId,jdbcType=VARCHAR},
last_organization_id = #{record.lastOrganizationId,jdbcType=VARCHAR}
<if
test=
"_parameter != null"
>
<include
refid=
"Update_By_Example_Where_Clause"
/>
</if>
...
...
@@ -251,12 +263,15 @@
<if
test=
"updateTime != null"
>
update_time = #{updateTime,jdbcType=BIGINT},
</if>
<if
test=
"lastSourceId != null"
>
last_source_id = #{lastSourceId,jdbcType=VARCHAR},
</if>
<if
test=
"language != null"
>
language = #{language,jdbcType=VARCHAR},
</if>
<if
test=
"lastWorkspaceId != null"
>
last_workspace_id = #{lastWorkspaceId,jdbcType=VARCHAR},
</if>
<if
test=
"lastOrganizationId != null"
>
last_organization_id = #{lastOrganizationId,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=VARCHAR}
</update>
...
...
@@ -268,8 +283,9 @@
status = #{status,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=BIGINT},
update_time = #{updateTime,jdbcType=BIGINT},
last_source_id = #{lastSourceId,jdbcType=VARCHAR},
language = #{language,jdbcType=VARCHAR}
language = #{language,jdbcType=VARCHAR},
last_workspace_id = #{lastWorkspaceId,jdbcType=VARCHAR},
last_organization_id = #{lastOrganizationId,jdbcType=VARCHAR}
where id = #{id,jdbcType=VARCHAR}
</update>
</mapper>
\ No newline at end of file
backend/src/main/java/io/metersphere/dto/UserDTO.java
浏览文件 @
bfa3ef70
...
...
@@ -21,20 +21,14 @@ public class UserDTO {
private
Long
updateTime
;
private
String
lastSourceId
;
private
String
workspaceId
;
private
String
organizationId
;
private
List
<
Role
>
roles
=
new
ArrayList
<>();
private
List
<
UserRole
>
userRoles
=
new
ArrayList
<>();
public
String
getLastSourceId
()
{
return
lastSourceId
;
}
public
void
setLastSourceId
(
String
lastSourceId
)
{
this
.
lastSourceId
=
lastSourceId
;
}
public
List
<
Role
>
getRoles
()
{
return
roles
;
}
...
...
@@ -108,4 +102,20 @@ public class UserDTO {
public
void
setUserRoles
(
List
<
UserRole
>
userRoles
)
{
this
.
userRoles
=
userRoles
;
}
public
String
getWorkspaceId
()
{
return
workspaceId
;
}
public
void
setWorkspaceId
(
String
workspaceId
)
{
this
.
workspaceId
=
workspaceId
;
}
public
String
getOrganizationId
()
{
return
organizationId
;
}
public
void
setOrganizationId
(
String
organizationId
)
{
this
.
organizationId
=
organizationId
;
}
}
backend/src/main/java/io/metersphere/service/UserService.java
浏览文件 @
bfa3ef70
...
...
@@ -223,7 +223,8 @@ public class UserService {
public
void
switchUserRole
(
UserDTO
user
,
String
sourceId
)
{
User
newUser
=
new
User
();
user
.
setLastSourceId
(
sourceId
);
// todo 切换处理
// user.setLastSourceId(sourceId);
BeanUtils
.
copyProperties
(
user
,
newUser
);
// 切换工作空间或组织之后更新 session 里的 user
SessionUtils
.
putUser
(
SessionUser
.
fromUser
(
user
));
...
...
backend/src/main/java/io/metersphere/user/SessionUser.java
浏览文件 @
bfa3ef70
package
io.metersphere.user
;
import
io.metersphere.dto.UserDTO
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.BeanUtils
;
import
java.io.Serializable
;
import
static
io
.
metersphere
.
commons
.
constants
.
RoleConstants
.*;
public
class
SessionUser
extends
UserDTO
implements
Serializable
{
private
static
final
long
serialVersionUID
=
-
7149638440406959033L
;
private
String
workspaceId
;
private
String
organizationId
;
public
String
getWorkspaceId
()
{
return
workspaceId
;
}
public
String
getOrganizationId
()
{
return
organizationId
;
}
public
static
SessionUser
fromUser
(
UserDTO
user
)
{
SessionUser
sessionUser
=
new
SessionUser
();
BeanUtils
.
copyProperties
(
user
,
sessionUser
);
String
lastSourceId
=
sessionUser
.
getLastSourceId
();
user
.
getUserRoles
().
forEach
(
ur
->
{
if
(
StringUtils
.
equals
(
ur
.
getSourceId
(),
lastSourceId
))
{
if
(
StringUtils
.
equals
(
ur
.
getRoleId
(),
ORG_ADMIN
))
{
sessionUser
.
organizationId
=
lastSourceId
;
return
;
}
if
(
StringUtils
.
equalsAny
(
ur
.
getRoleId
(),
TEST_MANAGER
,
TEST_USER
,
TEST_VIEWER
))
{
sessionUser
.
workspaceId
=
lastSourceId
;
}
}
});
return
sessionUser
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录