jiangyq
/
YZProjectCloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改用户注册

dev_xd
haha 2025-01-14 23:05:07 +08:00
parent 946004d476
commit 55dc571444
2 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java
View File

@ -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);
}else{
user.setIsActive(0l);
}
userMapper.insertUserCom(user);
}else{
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);
}
}
}
Long userId = user.getUserId();
if(Objects.nonNull(user.getUserType()) && Objects.nonNull(user.getActiveProjectId())){

7
yanzhu-ui-vue3/src/views/system/user/index.vue
View File

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