From 571c86edf0dacb37e0cf9d535a2c8478642671e4 Mon Sep 17 00:00:00 2001
From: wxg0103 <727495428@qq.com>
Date: Sat, 9 Mar 2024 11:31:48 +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=E6=9C=89=E7=BC=96=E8=BE=91=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=EF=BC=8C=E6=97=A0=E6=B3=95=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=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=1035376 --user=王孝刚 【系统设置】系统-用户组-组织成员-勾选成员修改权限，无法批量编辑成员 https://www.tapd.cn/55049933/s/1472170
---
 .../system/controller/OrganizationController.java           | 2 +-
 frontend/src/views/setting/organization/member/index.vue    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/controller/OrganizationController.java b/backend/services/system-setting/src/main/java/io/metersphere/system/controller/OrganizationController.java
index fe893f1509..2b51e50604 100644
--- a/backend/services/system-setting/src/main/java/io/metersphere/system/controller/OrganizationController.java
+++ b/backend/services/system-setting/src/main/java/io/metersphere/system/controller/OrganizationController.java
@@ -71,7 +71,7 @@ public class OrganizationController {
 
     @PostMapping("/project/add-member")
     @Operation(summary = "系统设置-组织-成员-添加组织成员至项目")
-    @RequiresPermissions(value = {PermissionConstants.ORGANIZATION_MEMBER_UPDATE, PermissionConstants.PROJECT_USER_READ_ADD})
+    @RequiresPermissions(PermissionConstants.ORGANIZATION_MEMBER_UPDATE)
     public void addMemberToProject(@Validated @RequestBody OrgMemberExtendProjectRequest orgMemberExtendProjectRequest) {
         organizationService.addMemberToProject(orgMemberExtendProjectRequest, SessionUtils.getUserId());
     }
diff --git a/frontend/src/views/setting/organization/member/index.vue b/frontend/src/views/setting/organization/member/index.vue
index b140df23e5..44b4d089e6 100644
--- a/frontend/src/views/setting/organization/member/index.vue
+++ b/frontend/src/views/setting/organization/member/index.vue
@@ -225,12 +225,12 @@
       {
         label: 'organization.member.batchActionAddProject',
         eventTag: 'batchAddProject',
-        permission: ['ORGANIZATION_MEMBER:READ+ADD'],
+        permission: ['ORGANIZATION_MEMBER:READ+UPDATE'],
       },
       {
         label: 'organization.member.batchActionAddUserGroup',
         eventTag: 'batchAddUserGroup',
-        permission: ['ORGANIZATION_MEMBER:READ+ADD'],
+        permission: ['ORGANIZATION_MEMBER:READ+UPDATE'],
       },
     ],
   };
@@ -239,7 +239,7 @@
     {
       tableKey: TableKeyEnum.ORGANIZATION_MEMBER,
       scroll: { x: 1600 },
-      selectable: !!hasAnyPermission(['ORGANIZATION_MEMBER:READ+ADD', 'ORGANIZATION_MEMBER:READ+ADD']),
+      selectable: hasAnyPermission(['ORGANIZATION_MEMBER:READ+ADD', 'ORGANIZATION_MEMBER:READ+UPDATE']),
       heightUsed: 288,
       showSetting: true,
       showJumpMethod: true,