From 06f42fa0eae9b0769b9921157aa1159381c161cb Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 27 二月 2023 15:41:35 +0800
Subject: [PATCH] fix 修复 租户管理被过滤数据权限问题
---
ruoyi-ui/src/store/modules/user.js | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/ruoyi-ui/src/store/modules/user.js b/ruoyi-ui/src/store/modules/user.js
index 66a7287..b375adc 100644
--- a/ruoyi-ui/src/store/modules/user.js
+++ b/ruoyi-ui/src/store/modules/user.js
@@ -3,6 +3,7 @@
const user = {
state: {
+ userId: undefined,
token: getToken(),
name: '',
avatar: '',
@@ -11,6 +12,9 @@
},
mutations: {
+ SET_USER_ID: (state, userId) => {
+ state.userId = userId
+ },
SET_TOKEN: (state, token) => {
state.token = token
},
@@ -31,14 +35,15 @@
actions: {
// 鐧诲綍
Login({ commit }, userInfo) {
+ const tenantId = userInfo.tenantId.trim()
const username = userInfo.username.trim()
const password = userInfo.password
const code = userInfo.code
const uuid = userInfo.uuid
return new Promise((resolve, reject) => {
- login(username, password, code, uuid).then(res => {
- setToken(res.token)
- commit('SET_TOKEN', res.token)
+ login(tenantId, username, password, code, uuid).then(res => {
+ setToken(res.data.token)
+ commit('SET_TOKEN', res.data.token)
resolve()
}).catch(error => {
reject(error)
@@ -49,17 +54,18 @@
// 鑾峰彇鐢ㄦ埛淇℃伅
GetInfo({ commit, state }) {
return new Promise((resolve, reject) => {
- getInfo(state.token).then(res => {
- const user = res.user
- const avatar = user.avatar == "" ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
- if (res.roles && res.roles.length > 0) { // 楠岃瘉杩斿洖鐨剅oles鏄惁鏄竴涓潪绌烘暟缁�
- commit('SET_ROLES', res.roles)
- commit('SET_PERMISSIONS', res.permissions)
+ getInfo().then(res => {
+ const user = res.data.user
+ const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : user.avatar;
+ if (res.data.roles && res.data.roles.length > 0) { // 楠岃瘉杩斿洖鐨剅oles鏄惁鏄竴涓潪绌烘暟缁�
+ commit('SET_ROLES', res.data.roles)
+ commit('SET_PERMISSIONS', res.data.permissions)
} else {
commit('SET_ROLES', ['ROLE_DEFAULT'])
}
commit('SET_NAME', user.userName)
commit('SET_AVATAR', avatar)
+ commit('SET_USER_ID', user.userId)
resolve(res)
}).catch(error => {
reject(error)
--
Gitblit v1.9.3