diff --git a/src/users/users.controller.ts b/src/users/users.controller.ts index 718c39f..791e6c7 100644 --- a/src/users/users.controller.ts +++ b/src/users/users.controller.ts @@ -298,7 +298,11 @@ export class UsersController { @Put('resend-user/:id') async resendUser(@Param('id', ParseUUIDPipe) id: string, @Request() req) { return { - data: await this.usersService.confirmationUser(id, req.user, 'resend'), + data: await this.usersService.confirmationUser( + id, + req.user.userId, + 'resend', + ), statusCode: HttpStatus.OK, message: 'success', }; diff --git a/src/users/users.service.ts b/src/users/users.service.ts index ea1ce7e..fb9cf9b 100644 --- a/src/users/users.service.ts +++ b/src/users/users.service.ts @@ -571,12 +571,11 @@ export class UsersService { const dataUser = await this.usersRepository.findOneOrFail(id); const supervisorUser = await this.findExist(user); - if (status == 'approved') { if (supervisorUser.roles.name == 'Admin') { dataUser.status_approval = 'Done'; dataUser.is_active = true; - }else { + } else { dataUser.status_approval = supervisorUser.superior.id; } } else if (status == 'resend') {