From 173702891eed23c39b531376b93201848d78f5a1 Mon Sep 17 00:00:00 2001
From: Ilham Dwi Pratama S <ilhamdwi876@gmail.com>
Date: Mon, 24 Jan 2022 12:11:26 +0700
Subject: [PATCH] fix approval user

---
 src/users/users.service.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/users/users.service.ts b/src/users/users.service.ts
index 4f43b8b..a57f79d 100644
--- a/src/users/users.service.ts
+++ b/src/users/users.service.ts
@@ -73,7 +73,7 @@ export class UsersService {
         approvalRole = 'Admin';
       }
       userData.superior = superior;
-      userData.status_approval = approvalRole;
+      userData.status_approval = superior.superior.id;
     } else {
       userData.superior = null;
       userData.partner = createUserDto.partner;
@@ -311,8 +311,7 @@ export class UsersService {
         'user.id != :id and user.superior_id = :superior and status_approval = :status and is_rejected is false',
         {
           id: superrior.userId,
-          superior: superrior.userId,
-          status: dataUser.roles.name,
+          status: superrior.userId,
         },
       )
       .leftJoinAndSelect('user.roles', 'roles', `roles.id = user.roles_id`)
@@ -571,7 +570,7 @@ export class UsersService {
       const supervisorUser = await this.usersRepository.findOneOrFail(id);
 
       if (status == 'approved') {
-        dataUser.status_approval = supervisorUser.roles.name;
+        dataUser.status_approval = supervisorUser.superior.id;
       } else if (status == 'resend') {
         dataUser.is_rejected = false;
       } else {