|
@@ -12,7 +12,8 @@ const user = {
|
|
|
name: storage.get(constant.name),
|
|
|
avatar: storage.get(constant.avatar),
|
|
|
roles: storage.get(constant.roles),
|
|
|
- roleName: storage.get(constant.roleName),
|
|
|
+ deptId: storage.get(constant.deptId),
|
|
|
+ deptName: storage.get(constant.deptName),
|
|
|
permissions: storage.get(constant.permissions),
|
|
|
autologin:storage.get(constant.autologin),
|
|
|
userId: storage.get(constant.userId),
|
|
@@ -38,9 +39,13 @@ const user = {
|
|
|
state.roles = roles
|
|
|
storage.set(constant.roles, roles)
|
|
|
},
|
|
|
- SET_ROLENAME: (state, roleName) => {
|
|
|
- state.roleName = roleName
|
|
|
- storage.set(constant.roleName, roleName)
|
|
|
+ SET_DEPID: (state, deptId) => {
|
|
|
+ state.deptId = deptId
|
|
|
+ storage.set(constant.deptId, deptId)
|
|
|
+ },
|
|
|
+ SET_DEPTNAME: (state, deptName) => {
|
|
|
+ state.deptName = deptName
|
|
|
+ storage.set(constant.deptName, deptName)
|
|
|
},
|
|
|
SET_PERMISSIONS: (state, permissions) => {
|
|
|
state.permissions = permissions
|
|
@@ -108,7 +113,6 @@ const user = {
|
|
|
if (res.confirm) {
|
|
|
commit('SET_TOKEN', '')
|
|
|
commit('SET_ROLES', [])
|
|
|
- commit('SET_ROLENAME', [])
|
|
|
commit('SET_PERMISSIONS', [])
|
|
|
removeToken()
|
|
|
storage.clean()
|
|
@@ -135,21 +139,25 @@ const user = {
|
|
|
const phonenumber = (user == null || user.phonenumber == "" || user.phonenumber == null) ? "" : user.phonenumber
|
|
|
const initFace = (user == null || user.initFace == "" || user.initFace == null) ? "" : user.initFace
|
|
|
const userType = (user == null || user.userType == "" || user.userType == null) ? "" : user.userType
|
|
|
- var roleName=[]
|
|
|
- if(user&&user.roles&&user.roles.length){
|
|
|
- user.roles.forEach(ite=>{
|
|
|
- if(ite.roleName){
|
|
|
- roleName.push(ite.roleName)
|
|
|
- }
|
|
|
- })
|
|
|
- }
|
|
|
+ const deptId = (user == null || user.deptId == "" || user.deptId == null) ? "" : user.deptId
|
|
|
+ const deptName = (user == null ||user.dept==null|| user.dept == ""||user.dept.deptName == "" || user.dept.deptName == null) ? "" : user.dept.deptName
|
|
|
+
|
|
|
+ // var roleName=[]
|
|
|
+ // if(user&&user.roles&&user.roles.length){
|
|
|
+ // user.roles.forEach(ite=>{
|
|
|
+ // if(ite.roleName){
|
|
|
+ // roleName.push(ite.roleName)
|
|
|
+ // }
|
|
|
+ // })
|
|
|
+ // }
|
|
|
if (res.roles && res.roles.length > 0) {
|
|
|
commit('SET_ROLES', res.roles)
|
|
|
commit('SET_PERMISSIONS', res.permissions)
|
|
|
} else {
|
|
|
commit('SET_ROLES', ['ROLE_DEFAULT'])
|
|
|
}
|
|
|
- commit('SET_ROLENAME', roleName)
|
|
|
+ commit('SET_DEPID', deptId)
|
|
|
+ commit('SET_DEPTNAME', deptName)
|
|
|
commit('SET_NAME', username)
|
|
|
commit('SET_AVATAR', avatar)
|
|
|
commit('SET_USERID', userId)
|