Merge remote-tracking branch 'origin/master'

This commit is contained in:
Captain.B 2021-03-24 19:07:14 +08:00
commit dfb0f1c12f
1 changed files with 8 additions and 1 deletions

View File

@ -267,7 +267,14 @@
let lastOrganizationId = this.currentUser.lastOrganizationId; let lastOrganizationId = this.currentUser.lastOrganizationId;
let userRole = this.currentUser.userRoles.filter(r => r.sourceId === lastOrganizationId); let userRole = this.currentUser.userRoles.filter(r => r.sourceId === lastOrganizationId);
if (userRole.length > 0) { 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 => { this.result = this.$post(url, this.condition, response => {
let data = response.data; let data = response.data;
this.items = data.listObject; this.items = data.listObject;