From 5573b0c02bff5a5028e0df1adff71567b184f95c Mon Sep 17 00:00:00 2001
From: liyd <1419499670@qq.com>
Date: Thu, 1 Dec 2022 17:30:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=A8=E6=88=B7=E6=98=B5?=
 =?UTF-8?q?=E7=A7=B0=E6=98=BE=E7=A4=BA=E4=B8=8E=E7=99=BB=E5=BD=95=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nladmin-ui/src/layout/components/Navbar.vue | 3 ++-
 nladmin-ui/src/store/modules/user.js        | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

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 @@
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="hover">
         <div class="avatar-wrapper">
 <!--          <img :src="Avatar" class="user-avatar" style="border: #f5141e 1px solid">-->
-          <span class="user-nickname">{{ user.nickName }}</span>
+          <span class="user-nickname">{{ user.personName }}</span>
+<!--          <span class="user-nickname">258</span>-->
         </div>
         <el-dropdown-menu slot="dropdown">
           <span style="display:block;" @click="show = true">
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)
 }