From c78889e71d16d26c03ff59746db47c6d4d2b98e0 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 03 三月 2025 20:41:25 +0800
Subject: [PATCH] Merge branch 'master' into dev

---
 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