diff --git a/src/pages/layout/components/LayoutHeader.vue b/src/pages/layout/components/LayoutHeader.vue
index 0f1d0b6..3e05b6f 100644
--- a/src/pages/layout/components/LayoutHeader.vue
+++ b/src/pages/layout/components/LayoutHeader.vue
@@ -228,7 +228,8 @@
                     id:'',
                     signPic:'',
                     replyPhone:'',
-                    cardNo:''
+                    cardNo:'',
+                    roleIds:[]
                 },
                 signUrl:'',
                 rulesClient: {
@@ -265,6 +266,9 @@
                     this.PersonalInfo.signPic = res.signPic
                     this.PersonalInfo.replyPhone = res.replyPhone
                     this.PersonalInfo.cardNo = res.cardNo
+
+                    this.PersonalInfo.deptId = res.deptId
+                    this.PersonalInfo.roleIds = res.roleIds
                 })
                 api.getQrCode().then(res => {
                     this.signUrl = 'data:image/jpg;base64,'+res
diff --git a/src/pages/system-management/user-management/components/addOrEditUserDialog.vue b/src/pages/system-management/user-management/components/addOrEditUserDialog.vue
index f3d502e..b47bf38 100644
--- a/src/pages/system-management/user-management/components/addOrEditUserDialog.vue
+++ b/src/pages/system-management/user-management/components/addOrEditUserDialog.vue
@@ -219,13 +219,14 @@ export default {
                 if (valid) {
                     _this.userInfo.username = _this.userInfo.phone;
 
-                    if(_this.userInfo.teamId!=''){
+                    if(_this.userInfo.teamId!=''&&_this.userInfo.teamId!=null){
                         _this.userInfo.deptId = _this.userInfo.teamId;
                     }
                     else
                     {
                         _this.userInfo.deptId = _this.userInfo.regionId;
                     }
+
                     if(Object.keys(this.addOrEditUserConfig.data).length>0)
                     {
                         api.updateUserById(_this.userInfo).then(res => {