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

fix(系统设置): 修复项目只读权限无法查看成员列表的缺陷 

--bug=1035398 --user=王孝刚 【系统设置】系统-用户组-组织成员-勾选项目查询权限，项目列表成员数不可点击
https://www.tapd.cn/55049933/s/1470489
This commit is contained in:
wxg0103 2024-03-06 17:06:47 +08:00 committed by 刘瑞斌
parent d329372d6b
commit 2b8cdc5359
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/services/system-setting/src/main/java/io/metersphere/system/controller/SystemOrganizationController.java
View File

@ -26,6 +26,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.authz.annotation.Logical;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@ -125,7 +126,7 @@ public class SystemOrganizationController {
@PostMapping("/list-member")
@Operation(summary = "系统设置-系统-组织与项目-组织-获取组织成员列表")
@RequiresPermissions(value = {PermissionConstants.SYSTEM_ORGANIZATION_PROJECT_READ, PermissionConstants.SYSTEM_USER_READ})
@RequiresPermissions(value = {PermissionConstants.SYSTEM_ORGANIZATION_PROJECT_READ, PermissionConstants.SYSTEM_USER_READ}, logical = Logical.OR)
public Pager<List<UserExtendDTO>> listMember(@Validated @RequestBody OrganizationRequest request) {
Page<Object> page = PageHelper.startPage(request.getCurrent(), request.getPageSize(), true);
return PageUtils.setPageInfo(page, organizationService.getMemberListBySystem(request));

2
frontend/src/views/setting/organization/project/orgProject.vue
View File

@ -41,7 +41,7 @@
</template>
<template #memberCount="{ record }">
<span
v-if="hasAnyPermission(['ORGANIZATION_PROJECT:READ+ADD_MEMBER'])"
v-if="hasAnyPermission(['ORGANIZATION_PROJECT:READ+ADD_MEMBER', 'ORGANIZATION_PROJECT:READ'])"
class="cursor-pointer text-[rgb(var(--primary-5))]"
@click="showUserDrawer(record)"
>{{ record.memberCount }}</span

2
frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue
View File

@ -23,7 +23,7 @@
</template>
<template #memberCount="{ record }">
<span
v-if="hasAnyPermission(['SYSTEM_ORGANIZATION_PROJECT:READ+ADD_MEMBER'])"
v-if="hasAnyPermission(['SYSTEM_ORGANIZATION_PROJECT:READ+ADD_MEMBER', 'SYSTEM_ORGANIZATION_PROJECT:READ'])"
class="primary-color"
@click="showUserDrawer(record)"
>{{ record.memberCount }}</span

2
frontend/src/views/setting/system/organizationAndProject/components/systemProject.vue
View File

@ -23,7 +23,7 @@
</template>
<template #memberCount="{ record }">
<span
v-if="hasAnyPermission(['SYSTEM_ORGANIZATION_PROJECT:READ+ADD_MEMBER'])"
v-if="hasAnyPermission(['SYSTEM_ORGANIZATION_PROJECT:READ+ADD_MEMBER', 'SYSTEM_ORGANIZATION_PROJECT:READ'])"
class="primary-color"
@click="showUserDrawer(record)"
>{{ record.memberCount }}</span