Merge branch 'dev' of github.com:fit2cloudrd/metersphere-server into dev

frontend/src/performance/components/settings/OrganizationWorkspace.vue

@@ -60,7 +60,9 @@
 
 <script>
   import MsCreateBox from "./CreateBox";
+  import Cookies from 'js-cookie';
   import {Message} from "element-ui";
+  import {TokenKey} from "../../../common/constants";
 
   export default {
     name: "OrganizationWorkspace",
@@ -68,6 +70,13 @@
     mounted() {
       this.list();
     },
+    computed: {
+      currentUser: () => {
+        let user = Cookies.get(TokenKey);
+        window.console.log(user);
+        return JSON.parse(user);
+      }
+    },
     methods: {
       create() {
         this.createVisible = true;
@@ -118,11 +127,21 @@
       },
       list() {
         let url = '/workspace/list/' + this.currentPage + '/' + this.pageSize;
+        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") {
             this.result = this.$post(url, {name: this.condition}, response => {
               let data = response.data;
               this.items = data.listObject;
               this.total = data.itemCount;
             });
+          } else {
+            this.items = [];
+            this.total = 0;
+          }
+        }
+
       },
       handleSizeChange(size) {
         this.pageSize = size;