作者 若依
提交者 Gitee

!453 update ruoyi-ui/src/store/modules/user.js.

Merge pull request !453 from guxin0123/N/A
@@ -51,7 +51,7 @@ const user = { @@ -51,7 +51,7 @@ const user = {
51 return new Promise((resolve, reject) => { 51 return new Promise((resolve, reject) => {
52 getInfo().then(res => { 52 getInfo().then(res => {
53 const user = res.user 53 const user = res.user
54 - const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar; 54 + const avatar = ( user.avatar == "" || user.avatar == null ) ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
55 if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组 55 if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
56 commit('SET_ROLES', res.roles) 56 commit('SET_ROLES', res.roles)
57 commit('SET_PERMISSIONS', res.permissions) 57 commit('SET_PERMISSIONS', res.permissions)