From 2b8cdc5359f9ce8bfe7f6b250369209b15a494ec Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Wed, 6 Mar 2024 17:06:47 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AE=E5=8F=AA=E8=AF=BB=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E6=97=A0=E6=B3=95=E6=9F=A5=E7=9C=8B=E6=88=90=E5=91=98?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1035398 --user=王孝刚 【系统设置】系统-用户组-组织成员-勾选项目查询权限，项目列表成员数不可点击
https://www.tapd.cn/55049933/s/1470489
---
 .../system/controller/SystemOrganizationController.java        | 3 ++-
 frontend/src/views/setting/organization/project/orgProject.vue | 2 +-
 .../organizationAndProject/components/systemOrganization.vue   | 2 +-
 .../system/organizationAndProject/components/systemProject.vue | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/controller/SystemOrganizationController.java b/backend/services/system-setting/src/main/java/io/metersphere/system/controller/SystemOrganizationController.java
index 2a479e90b7..2c02e7fde4 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/controller/SystemOrganizationController.java
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/controller/SystemOrganizationController.java
@@ -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));
diff --git a/frontend/src/views/setting/organization/project/orgProject.vue b/frontend/src/views/setting/organization/project/orgProject.vue
index 3e46873437..0d99018135 100644
--- a/frontend/src/views/setting/organization/project/orgProject.vue
+++ b/frontend/src/views/setting/organization/project/orgProject.vue
@@ -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
diff --git a/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue b/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue
index 41c882c643..1a2ead9ba0 100644
--- a/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue
+++ b/frontend/src/views/setting/system/organizationAndProject/components/systemOrganization.vue
@@ -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
diff --git a/frontend/src/views/setting/system/organizationAndProject/components/systemProject.vue b/frontend/src/views/setting/system/organizationAndProject/components/systemProject.vue
index 254aa104b8..3587c63f06 100644
--- a/frontend/src/views/setting/system/organizationAndProject/components/systemProject.vue
+++ b/frontend/src/views/setting/system/organizationAndProject/components/systemProject.vue
@@ -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