Merge remote-tracking branch 'origin/master'

babysor · Mar 24, 2021 · dfb0f1c · dfb0f1c
2 parents d92526a + 27e405f
commit dfb0f1c
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue b/frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
@@ -267,7 +267,14 @@
         let lastOrganizationId = this.currentUser.lastOrganizationId;
         let userRole = this.currentUser.userRoles.filter(r => r.sourceId === lastOrganizationId);
         if (userRole.length > 0) {
-          if (userRole[0].roleId === "org_admin") {
+          let isOrg_admin = false;
+          userRole.forEach(row=>{
+            if(row.roleId === "org_admin" ){
+              isOrg_admin = true;
+              return;
+            }
+          });
+          if (isOrg_admin) {
             this.result = this.$post(url, this.condition, response => {
               let data = response.data;
               this.items = data.listObject;