|
@@ -184,17 +184,19 @@ public class WebTenantGatewayImpl implements WebTenantGateway {
|
|
|
if (exist != null && !exist.getUserId().equals(req.getUserId())) {
|
|
|
throw new BizException(ErrorEnum.USER_ALREADY_EXISTS.getErrorCode(), ErrorEnum.USER_ALREADY_EXISTS.getErrorMessage());
|
|
|
}
|
|
|
+
|
|
|
+ AdminUserInfo origin = adminUserService.getById(req.getUserId());
|
|
|
//2.保存新用户到 admin_user_info 表
|
|
|
- BeanUtils.copyProperties(req, exist);
|
|
|
- exist.setPassword(PasswordUtil.encrypt(req.getPassword()));
|
|
|
- exist.setUserType(AdminUserType.USER_ADMIN.getCode());
|
|
|
- exist.setTenantId(req.getTenantId());
|
|
|
- adminUserService.updateAllById(exist);
|
|
|
+ BeanUtils.copyProperties(req, origin);
|
|
|
+ origin.setPassword(PasswordUtil.encrypt(req.getPassword()));
|
|
|
+ origin.setUserType(AdminUserType.USER_ADMIN.getCode());
|
|
|
+ origin.setTenantId(req.getTenantId());
|
|
|
+ adminUserService.updateAllById(origin);
|
|
|
|
|
|
//3.保存用户角色到 tbl_user_role 表
|
|
|
- tblUserRoleService.delByUserId(exist.getUserId());
|
|
|
+ tblUserRoleService.delByUserId(origin.getUserId());
|
|
|
TblUserRole userRole = new TblUserRole();
|
|
|
- userRole.setUserId(exist.getUserId());
|
|
|
+ userRole.setUserId(origin.getUserId());
|
|
|
userRole.setRoleId(req.getRoleId());
|
|
|
tblUserRoleService.save(userRole);
|
|
|
}
|