From 7a267fc8e5bc6bbe1d770c1aebb50bbed5461e22 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 07 二月 2025 17:45:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/store/modules/user.js | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 7906a53..3a8f745 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -8,6 +8,7 @@
name: '',
avatar: '',
deptId: null,
+ deptName: '',
roles: [],
roleIds: [],
permissions: []
@@ -34,6 +35,9 @@
},
SET_DEPT: (state, deptId) => {
state.deptId = deptId
+ },
+ SET_DEPT_NAME: (state, deptName) => {
+ state.deptName = deptName
},
SET_PERMISSIONS: (state, permissions) => {
state.permissions = permissions
@@ -74,6 +78,7 @@
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)
--
Gitblit v1.8.0