修复用户昵称显示与登录跳转问题

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">

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)
 }