test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
wenyann 2021-03-24 19:11:18 +08:00
parent e9c004d8ef dfb0f1c12f
commit beac8a9a14
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
frontend/src/business/components/settings/organization/OrganizationWorkspace.vue
View File

@ -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;

2
frontend/src/business/components/xpack

@ -1 +1 @@
Subproject commit 07951ba17aef6f29e50cfd68e40de3266f9a60cd
Subproject commit 2115bd28a90854d2b6276a90878934715498c584