From cc4e761c052926eaab8c00d6588ec9988508f274 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 12 Jul 2021 15:21:04 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E3=80=81=E5=B7=A5=E4=BD=9C=E7=A9=BA=E9=97=B4?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=88=90=E5=91=98=E6=93=8D=E4=BD=9C=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E9=97=AE=E9=A2=98#1004964?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../settings/organization/OrganizationWorkspace.vue         | 6 +++---
 .../business/components/settings/workspace/MsProject.vue    | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
index 989cc88623..a56d0cc09e 100644
--- a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
+++ b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
@@ -73,7 +73,7 @@
                class="dialog-css">
       <template v-slot:title>
         <ms-table-header :condition.sync="dialogCondition" @create="addMember" @search="dialogSearch"
-                         :create-permission="['ORGANIZATION_WORKSPACE:READ+CREATE', 'ORGANIZATION_WORKSPACE:READ+EDIT']"
+                         :create-permission="['ORGANIZATION_USER:READ+CREATE']"
                          :create-tip="$t('member.create')" :title="$t('commons.member')"/>
       </template>
 
@@ -91,8 +91,8 @@
           <template v-slot:default="scope">
             <div>
               <ms-table-operator :tip2="$t('commons.remove')"
-                                 :edit-permission="['ORGANIZATION_WORKSPACE:READ+CREATE', 'ORGANIZATION_WORKSPACE:READ+EDIT']"
-                                 :delete-permission="['ORGANIZATION_WORKSPACE:READ+CREATE', 'ORGANIZATION_WORKSPACE:READ+EDIT']"
+                                 :edit-permission="['ORGANIZATION_USER:READ+EDIT']"
+                                 :delete-permission="['ORGANIZATION_USER:READ+DELETE']"
                                  @editClick="editMember(scope.row)"
                                  @deleteClick="delMember(scope.row)"/>
             </div>
diff --git a/frontend/src/business/components/settings/workspace/MsProject.vue b/frontend/src/business/components/settings/workspace/MsProject.vue
index bb5029ced2..c3a18b15e7 100644
--- a/frontend/src/business/components/settings/workspace/MsProject.vue
+++ b/frontend/src/business/components/settings/workspace/MsProject.vue
@@ -144,6 +144,7 @@
                class="dialog-css">
       <template v-slot:title>
         <ms-table-header :condition.sync="dialogCondition" @create="open" @search="list" :have-search="false"
+                         :create-permission="['WORKSPACE_USER:READ+CREATE']"
                          :create-tip="$t('member.create')" :title="$t('commons.member')"/>
       </template>
       <div>
@@ -160,7 +161,10 @@
           <el-table-column :label="$t('commons.operating')">
             <template v-slot:default="scope">
               <div>
-                <ms-table-operator :tip2="$t('commons.remove')" @editClick="editMember(scope.row)"
+                <ms-table-operator :tip2="$t('commons.remove')"
+                                   :edit-permission="['WORKSPACE_USER:READ+EDIT']"
+                                   :delete-permission="['WORKSPACE_USER:READ+DELETE']"
+                                   @editClick="editMember(scope.row)"
                                    @deleteClick="delMember(scope.row)"/>
               </div>
             </template>