From 16f122cfcec09e65e4790ecee46bae1f1b7b8fff Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期日, 02 三月 2025 10:17:38 +0800
Subject: [PATCH] Merge branch 'master' into dev
---
src/store/modules/user.js | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index cdbab1e..3a8f745 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -7,7 +7,10 @@
id: '',
name: '',
avatar: '',
+ deptId: null,
+ deptName: '',
roles: [],
+ roleIds: [],
permissions: []
},
@@ -26,6 +29,15 @@
},
SET_ROLES: (state, roles) => {
state.roles = roles
+ },
+ SET_ROLE_IDS: (state, roleIds) => {
+ state.roleIds = roleIds
+ },
+ SET_DEPT: (state, deptId) => {
+ state.deptId = deptId
+ },
+ SET_DEPT_NAME: (state, deptName) => {
+ state.deptName = deptName
},
SET_PERMISSIONS: (state, permissions) => {
state.permissions = permissions
@@ -63,8 +75,12 @@
commit('SET_ROLES', ['ROLE_DEFAULT'])
}
commit('SET_ID', user.userId)
+ commit('SET_ROLE_IDS', user.roles.map(role => role.roleId))
commit('SET_NAME', user.userName)
+ commit('SET_DEPT', user.deptId)
+ commit('SET_DEPT_NAME', user.dept ? user.dept.deptName : '')
commit('SET_AVATAR', avatar)
+
resolve(res)
}).catch(error => {
reject(error)
--
Gitblit v1.8.0