From 2f380f0c4177d02010759c0ecf0c63543bb90157 Mon Sep 17 00:00:00 2001 From: 若依 <yzz_ivy@163.com> Date: 星期五, 26 八月 2022 08:42:03 +0800 Subject: [PATCH] !564 修复执行任务时,若方法入口在任务的父类,则无法执行的问题 Merge pull request !564 from 捏造的信仰/fix-issue-I5NNXI --- ruoyi-ui/src/store/modules/user.js | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ruoyi-ui/src/store/modules/user.js b/ruoyi-ui/src/store/modules/user.js index 92bd8f7..75c0c57 100644 --- a/ruoyi-ui/src/store/modules/user.js +++ b/ruoyi-ui/src/store/modules/user.js @@ -51,7 +51,7 @@ return new Promise((resolve, reject) => { getInfo().then(res => { const user = res.user - const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar; + const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar; if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组 commit('SET_ROLES', res.roles) commit('SET_PERMISSIONS', res.permissions) @@ -66,7 +66,7 @@ }) }) }, - + // 退出系统 LogOut({ commit, state }) { return new Promise((resolve, reject) => { -- Gitblit v1.9.2