From 261f2ed00235d47df3754291a4fdca9ba5cb8e7a Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期四, 21 五月 2026 17:16:09 +0800
Subject: [PATCH] fix: 合并财务数据
---
src/store/modules/user.js | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index b7714f6..0d2e61e 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -52,13 +52,13 @@
getInfo() {
return new Promise((resolve, reject) => {
getInfo().then(res => {
- res = res.data
- const user = res.user || {}
+ const data = res?.data ?? res
+ const user = data.user || {}
let avatar = user.avatar || ""
avatar = import.meta.env.VITE_APP_BASE_API + '/profile/' + avatar
- if (res.roles && res.roles.length > 0) { // 楠岃瘉杩斿洖鐨剅oles鏄惁鏄竴涓潪绌烘暟缁�
- this.roles = res.roles
- this.permissions = res.permissions
+ if (data.roles && data.roles.length > 0) { // 楠岃瘉杩斿洖鐨剅oles鏄惁鏄竴涓潪绌烘暟缁�
+ this.roles = data.roles
+ this.permissions = data.permissions
} else {
this.roles = ['ROLE_DEFAULT']
}
@@ -70,8 +70,8 @@
this.roleName = Array.isArray(user.roles) && user.roles.length > 0 ? (user.roles[0].roleName || '') : ''
this.currentDeptId = user.tenantId || ''
this.currentLoginTime = this.getCurrentTime()
- this.aiEnabled = Number(res.aiEnabled) === 1 ? 1 : 0
- resolve(res)
+ this.aiEnabled = Number(data.aiEnabled) === 1 ? 1 : 0
+ resolve(data)
}).catch(error => {
reject(error)
})
--
Gitblit v1.9.3