diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java
index ccfbbf4a..0f4ab887 100644
--- a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java
+++ b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java
@@ -347,7 +347,7 @@ public class SysUserServiceImpl implements ISysUserService
             e.printStackTrace();
         }
         // 新增用户信息
-        //user.setUserName(userNameAndCout(user.getNickName()));
+        user.setUserName(userNameAndCout(user.getNickName()));
         SysDept dept = deptMapper.selectDeptById(user.getDeptId());
         if(Objects.isNull(dept)){
             throw new ServiceException("所属单位选择异常，必须选择子公司及下属单位");
@@ -441,16 +441,6 @@ public class SysUserServiceImpl implements ISysUserService
     {
         SysUser sysUser = userMapper.selectByPhone(user.getPhonenumber());
         if(Objects.nonNull(sysUser)){
-            if(user.getComId().equals(sysUser.getOldComId())){
-                SysUser where=new SysUser();
-                where.setUserId(sysUser.getUserId());
-                where.setComId(sysUser.getOldComId());
-                SysUser oldUserCom=userMapper.selectUserCom(where);
-                if(Objects.nonNull(oldUserCom)){
-                    throw new ServiceException("此用户己在此项目中！");
-                }
-                userMapper.updateUserCom(sysUser);
-            }
             user.setUserId(sysUser.getUserId());
             sysUser.setUserName(user.getUserName());
             sysUser.setPhonenumber(user.getUserName());
@@ -467,10 +457,30 @@ public class SysUserServiceImpl implements ISysUserService
             List<SysUser> userComs=userMapper.selectUserComs(user.getUserId());
             if(userComs.size()==0){
                 user.setIsActive(1l);
+                userMapper.insertUserCom(user);
             }else{
-                user.setIsActive(0l);
+                long cnt=  userComs.stream().filter(d->d.getComId().equals(user.getComId())).count();
+                if(cnt==0) {
+                    user.setIsActive(0l);
+                    userMapper.insertUserCom(user);
+                }
+            }
+            SysUserExt where=new SysUserExt();
+            where.setUserId(user.getUserId());
+            where.setComId(user.getComId());
+            List<SysUserExt> userExts=userExtService.selectSysUserExtList(where);
+            if(userExts.size()==0){
+               where.setIsActive(1l);
+               where.setProjectId(user.getDeptId());
+               userExtService.insertSysUserExt(where);
+            }else{
+                long cnt=  userExts.stream().filter(d->d.getProjectId().equals(user.getDeptId())).count();
+                if(cnt==0){
+                    where.setIsActive(0l);
+                    where.setProjectId(user.getDeptId());
+                    userExtService.insertSysUserExt(where);
+                }
             }
-            userMapper.insertUserCom(user);
         }
         Long userId = user.getUserId();
         if(Objects.nonNull(user.getUserType()) && Objects.nonNull(user.getActiveProjectId())){
diff --git a/yanzhu-ui-vue3/src/views/system/user/index.vue b/yanzhu-ui-vue3/src/views/system/user/index.vue
index f14f41da..7fd2ec14 100644
--- a/yanzhu-ui-vue3/src/views/system/user/index.vue
+++ b/yanzhu-ui-vue3/src/views/system/user/index.vue
@@ -129,13 +129,14 @@
                   </el-form-item>
                </el-col>
                <el-col :span="12">
-                  <el-form-item label="用户名称" prop="nickName">
-                     <el-input v-model="form.nickName" :disabled="data.editUser" placeholder="请输入用户名称" maxlength="30"
+                  <el-form-item label="用户姓名" prop="nickName">
+                     <el-input v-model="form.nickName"  placeholder="请输入用户名称" maxlength="30"
                         style="width: 150px;" />
+                        <!--
                      <el-button v-if="data.mode == 'add' && !data.editUser" type="primary" style="margin-left: 10px;"
                         @click="doQueryUserByName">查询</el-button>
                      <el-button v-if="data.editUser" type="success" style="margin-left: 10px;"
-                        @click="doCleanEditData">清除</el-button>
+                        @click="doCleanEditData">清除</el-button>-->
                   </el-form-item>
                </el-col>
                <el-col :span="12">