test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: 工作台处理

This commit is contained in:
guoyuqi 2021-10-28 14:45:44 +08:00 committed by 刘瑞斌
parent 15efbb5285
commit c44197f908
5 changed files with 30 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
backend/src/main/java/io/metersphere/base/mapper/ext/ExtTestPlanMapper.xml
View File

@ -153,19 +153,36 @@
#{value} #{value}
</foreach> </foreach>
</when> </when>
<otherwise> <when test="key=='status'">
and test_plan.status in <choose>
<foreach collection="values" item="value" separator="," open="(" close=")"> <when test="request.executorOrPrincipal != null">
#{value} AND (( test_plan_principal.principal_id = '${@io.metersphere.commons.utils.SessionUtils@getUserId()}' and
</foreach> test_plan.status in
</otherwise> <foreach collection="values" item="value" separator="," open="(" close=")">
#{value}
</foreach>
)
or
(test_plan_test_case.executor = '${@io.metersphere.commons.utils.SessionUtils@getUserId()}' and
test_plan_test_case.status in
<foreach collection="values" item="value" separator="," open="(" close=")">
#{value}
</foreach>
))
</when>
<otherwise >
and test_plan.status in
<foreach collection="values" item="value" separator="," open="(" close=")">
#{value}
</foreach>
</otherwise>
</choose>
</when>
</choose> </choose>
</if> </if>
</foreach> </foreach>
</if> </if>
<if test="request.executorOrPrincipal != null">
AND ( test_plan.creator = '${@io.metersphere.commons.utils.SessionUtils@getUserId()}' or test_plan_principal.principal_id = '${@io.metersphere.commons.utils.SessionUtils@getUserId()}' or test_plan_test_case.executor = '${@io.metersphere.commons.utils.SessionUtils@getUserId()}')
</if>
</where> </where>
<if test="request.orders != null and request.orders.size() > 0"> <if test="request.orders != null and request.orders.size() > 0">

2
frontend/src/business/components/common/head/HeaderTopMenus.vue
View File

@ -8,7 +8,7 @@
@select="handleSelect" @select="handleSelect"
:key="menuKey" :key="menuKey"
router> router>
<el-menu-item index="/workstation" onselectstart="return false" <el-menu-item index="/workstation" v-xpack onselectstart="return false"
v-permission="['PROJECT_API_DEFINITION:READ','PROJECT_API_SCENARIO:READ','PROJECT_API_REPORT:READ']"> v-permission="['PROJECT_API_DEFINITION:READ','PROJECT_API_SCENARIO:READ','PROJECT_API_REPORT:READ']">
{{ $t('commons.my_workstation') }} {{ $t('commons.my_workstation') }}
</el-menu-item> </el-menu-item>

2
frontend/src/business/components/xpack

@ -1 +1 @@
Subproject commit 98932507cfbeb7b1529c41360898cdf0947e7252 Subproject commit b50fa6030ea19d01985aabed1e7d9d804737ad59

2
frontend/src/i18n/zh-CN.js
View File

@ -342,7 +342,7 @@ export default {
workstation:{ workstation:{
dash_board: '我的仪表盘', dash_board: '我的仪表盘',
upcoming: '我的待办', upcoming: '我的待办',
focus: '我关注的', focus: '我的关注',
creation: '我创建的', creation: '我创建的',
table_name:{ table_name:{
track_case:'功能用例', track_case:'功能用例',

2
frontend/src/i18n/zh-TW.js
View File

@ -342,7 +342,7 @@ export default {
workstation:{ workstation:{
dash_board: '我的儀錶盤', dash_board: '我的儀錶盤',
upcoming: '我的待辦', upcoming: '我的待辦',
focus: '我關注的', focus: '我的關注',
creation: '我創建的', creation: '我創建的',
table_name:{ table_name:{
track_case:'功能用例', track_case:'功能用例',