|
@@ -351,6 +351,7 @@ public class SysUserController {
|
|
|
public Result<SysUser> edit(@RequestBody JSONObject jsonObject) {
|
|
|
Result<SysUser> result = new Result<SysUser>();
|
|
|
try {
|
|
|
+ //id查询用户信息
|
|
|
SysUser sysUser = sysUserService.getById(jsonObject.getString("id"));
|
|
|
sysBaseAPI.addLog("编辑用户,id: " + jsonObject.getString("id"), CommonConstant.LOG_TYPE_2, 2);
|
|
|
if (sysUser == null) {
|
|
@@ -360,16 +361,16 @@ public class SysUserController {
|
|
|
user.setUpdateTime(new Date());
|
|
|
//String passwordEncode = PasswordUtil.encrypt(user.getUsername(), user.getPassword(), sysUser.getSalt());
|
|
|
user.setPassword(sysUser.getPassword());
|
|
|
- String roles = jsonObject.getString("selectedroles");
|
|
|
- String departs = jsonObject.getString("selecteddeparts");
|
|
|
+ String roles = jsonObject.getString("selectedroles");//用户角色
|
|
|
+ String departs = jsonObject.getString("selecteddeparts");//用户部门
|
|
|
if (!Check.isNull(departs)) {
|
|
|
SysDepart depart = departService.getById(departs);
|
|
|
if (!Check.isNull(depart)) {
|
|
|
user.setOrgCode(depart.getOrgCode());
|
|
|
}
|
|
|
}
|
|
|
- sysUserService.editUserWithRole(user, roles);
|
|
|
- sysUserService.editUserWithDepart(user, departs);
|
|
|
+ sysUserService.editUserWithRole(user, roles);//修改角色
|
|
|
+ sysUserService.editUserWithDepart(user, departs);//修改部门
|
|
|
sysUserService.updateNullPhoneEmail();
|
|
|
|
|
|
userCompanyService.addOrUpdateUserWithCompany(user);
|
|
@@ -383,7 +384,7 @@ public class SysUserController {
|
|
|
memberQueryWrapper.eq("user_id", user.getId());
|
|
|
ProjectMember updateMember = new ProjectMember();
|
|
|
updateMember.setRoleCode(sysRole.getRoleCode());
|
|
|
- memberService.update(updateMember, memberQueryWrapper);
|
|
|
+ memberService.update(updateMember, memberQueryWrapper);//更新项目人员角色信息
|
|
|
}
|
|
|
}
|
|
|
};
|