diff --git a/src/users/users.service.ts b/src/users/users.service.ts index 4e256ac..fcfc03b 100644 --- a/src/users/users.service.ts +++ b/src/users/users.service.ts @@ -571,8 +571,13 @@ export class UsersService { const dataUser = await this.usersRepository.findOneOrFail(id); const supervisorUser = await this.findExist(user); + if (status == 'approved') { - dataUser.status_approval = supervisorUser.superior.id; + if (supervisorUser.roles.name == 'Admin') { + dataUser.status_approval = 'Done'; + }else { + dataUser.status_approval = supervisorUser.superior.id; + } } else if (status == 'resend') { dataUser.is_rejected = false; } else {