Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子Li

2022-03-25 9d1d74c022fd6d826c8084d1dbf248f31c51debd

 ruoyi-ui/src/store/modules/user.js

@@ -51,7 +51,7 @@
      return new Promise((resolve, reject) => {
        getInfo().then(res => {
          const user = res.data.user
          const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : user.avatar;
          const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : user.avatar;
          if (res.data.roles && res.data.roles.length > 0) { // 验证返回的roles是否是一个非空数组
            commit('SET_ROLES', res.data.roles)
            commit('SET_PERMISSIONS', res.data.permissions)