diff --git a/nladmin-ui/src/layout/components/Navbar.vue b/nladmin-ui/src/layout/components/Navbar.vue index a3347ee..2054253 100644 --- a/nladmin-ui/src/layout/components/Navbar.vue +++ b/nladmin-ui/src/layout/components/Navbar.vue @@ -25,7 +25,8 @@
- {{ user.nickName }} + {{ user.personName }} +
diff --git a/nladmin-ui/src/store/modules/user.js b/nladmin-ui/src/store/modules/user.js index 4439365..c8d20e2 100644 --- a/nladmin-ui/src/store/modules/user.js +++ b/nladmin-ui/src/store/modules/user.js @@ -85,10 +85,10 @@ export const logOut = (commit) => { export const setUserInfo = (res, commit) => { // 如果没有任何权限,则赋予一个默认的权限,避免请求死循环 - if (res.roles.length === 0) { + if (res.permissions.length === 0) { commit('SET_ROLES', ['ROLE_SYSTEM_DEFAULT']) } else { - commit('SET_ROLES', res.roles) + commit('SET_ROLES', res.permissions) } commit('SET_USER', res.user) }