From 6ae0fcef149ddbe614746023a58a3885b3ac4bde Mon Sep 17 00:00:00 2001 From: zxl <763096477@qq.com> Date: 星期二, 25 三月 2025 11:31:04 +0800 Subject: [PATCH] Merge branch 'dev' --- src/store/modules/user.js | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/src/store/modules/user.js b/src/store/modules/user.js index cdbab1e..09c7af6 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -7,7 +7,11 @@ id: '', name: '', avatar: '', + deptId: null, + childDeptIds: [], + deptName: '', roles: [], + roleIds: [], permissions: [] }, @@ -26,6 +30,18 @@ }, SET_ROLES: (state, roles) => { state.roles = roles + }, + SET_ROLE_IDS: (state, roleIds) => { + state.roleIds = roleIds + }, + SET_DEPT: (state, deptId) => { + state.deptId = deptId + }, + SET_CHILD_DEPT: (state, deptIds) => { + state.childDeptIds = deptIds + }, + SET_DEPT_NAME: (state, deptName) => { + state.deptName = deptName }, SET_PERMISSIONS: (state, permissions) => { state.permissions = permissions @@ -63,8 +79,13 @@ 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_CHILD_DEPT', res.childDeptList) + commit('SET_DEPT_NAME', user.dept ? user.dept.deptName : '') commit('SET_AVATAR', avatar) + resolve(res) }).catch(error => { reject(error) -- Gitblit v1.8.0