From f15ca7439c7b74b318e11fba1a8b5857569ccbcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com> Date: Mon, 14 Mar 2022 15:03:08 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E6=8A=A5=E9=94=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/users/User/UserDetail/UserInfo.vue | 6 +++--- src/views/users/User/UserDetail/index.vue | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/users/User/UserDetail/UserInfo.vue b/src/views/users/User/UserDetail/UserInfo.vue index 0f5f97867..ebe14190c 100644 --- a/src/views/users/User/UserDetail/UserInfo.vue +++ b/src/views/users/User/UserDetail/UserInfo.vue @@ -229,9 +229,9 @@ export default { { key: this.$t('users.Role'), formatter: (item, val) => { - const org_roles_display = this.object.org_roles_display - const system_roles_display = this.object.system_roles_display - const roles_display = org_roles_display.split(', ').concat(system_roles_display.split(', ')) + const org_roles_display = this.object.org_roles_display || '' + const system_roles_display = this.object.system_roles_display || '' + const roles_display = org_roles_display?.split(', ').concat(system_roles_display?.split(', ')) return { roles_display.join(' | ') } } }, diff --git a/src/views/users/User/UserDetail/index.vue b/src/views/users/User/UserDetail/index.vue index 74c79915b..485b84eb3 100644 --- a/src/views/users/User/UserDetail/index.vue +++ b/src/views/users/User/UserDetail/index.vue @@ -41,7 +41,7 @@ export default { { title: this.$t('users.tabs.grantedAssets'), name: 'UserGrantedAssets', - hidden: () => !vm.$hasPerm('perms.view_myassets') + hidden: () => !vm.$hasPerm('perms.view_userassets') }, { title: this.$t('users.tabs.assetPermissionRules'),