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

fix(个人中心): 修复账号在项目下有多个用户组时个人中心显示项目未去重的问题 

--bug=1036729 --user=宋天阳 【个人信息】 当前账号只再两个项目下面有权限，个人信息有个【南区客户成功测试项目】显示重复 https://www.tapd.cn/55049933/s/1468874
This commit is contained in:
song-tianyang 2024-03-04 18:07:47 +08:00 committed by 建国
parent 55b8f0b943
commit b717ecd71a
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/services/system-setting/src/main/java/io/metersphere/system/service/UserRoleRelationService.java
View File

@ -141,7 +141,7 @@ public class UserRoleRelationService {
if (organization != null) { if (organization != null) {
returnMap.computeIfAbsent(organization, k -> new ArrayList<>()); returnMap.computeIfAbsent(organization, k -> new ArrayList<>());
Project project = projectMapper.selectByPrimaryKey(userRoleRelation.getSourceId()); Project project = projectMapper.selectByPrimaryKey(userRoleRelation.getSourceId());
if (project != null) { if (project != null && !returnMap.get(organization).contains(project)) {
returnMap.get(organization).add(project); returnMap.get(organization).add(project);
} }
} }

7
frontend/src/views/bug-management/components/deleteModal.vue
View File

@ -9,12 +9,7 @@
<template #title> <template #title>
<div class="flex flex-row items-center"> <div class="flex flex-row items-center">
<icon-exclamation-circle-fill class="text-[16px] text-[rgb(var(--danger-6))]" /> <icon-exclamation-circle-fill class="text-[16px] text-[rgb(var(--danger-6))]" />
<div class="ml-[8px]">{{ t('common.confirmDelete') }}</div> <div class="ml-[8px]">{{ t('bugManagement.detail.deleteTitle', {name: props.name}) }}</div>
<a-tooltip :content="props.name">
<div class="one-text-line max-w-[300px] px-[5px]">
{{ props.name }}
</div>
</a-tooltip>
</div> </div>
</template> </template>
<div class="form"> <div class="form">