From 30f160446e7bc507ffc841dd9478d45d459698fc Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 15 Feb 2022 19:53:44 +0800
Subject: [PATCH] =?UTF-8?q?v3.5.0=20=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yudao-ui-admin/src/permission.js         | 6 ++----
 yudao-ui-admin/src/store/modules/user.js | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/yudao-ui-admin/src/permission.js b/yudao-ui-admin/src/permission.js
index 6b8e5f586..d40972193 100644
--- a/yudao-ui-admin/src/permission.js
+++ b/yudao-ui-admin/src/permission.js
@@ -21,10 +21,8 @@ router.beforeEach((to, from, next) => {
         // 获取字典数据
         store.dispatch('dict/loadDictDatas')
         // 判断当前用户是否已拉取完user_info信息
-        store.dispatch('GetInfo').then(res => {
-          // 拉取user_info
-          const roles = res.roles
-          store.dispatch('GenerateRoutes', { roles }).then(accessRoutes => {
+        store.dispatch('GetInfo').then(() => {
+          store.dispatch('GenerateRoutes').then(accessRoutes => {
             // 根据roles权限生成可访问的路由表
             router.addRoutes(accessRoutes) // 动态添加可访问路由表
             next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
diff --git a/yudao-ui-admin/src/store/modules/user.js b/yudao-ui-admin/src/store/modules/user.js
index 1f868ff1e..78da4ece4 100644
--- a/yudao-ui-admin/src/store/modules/user.js
+++ b/yudao-ui-admin/src/store/modules/user.js
@@ -90,7 +90,7 @@ const user = {
     // 获取用户信息
     GetInfo({ commit, state }) {
       return new Promise((resolve, reject) => {
-        getInfo(state.token).then(res => {
+        getInfo().then(res => {
           // 没有 data 数据，赋予个默认值
           if (!res) {
             res = {