PPOB/ppob-backend
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' of https://gitlab.com/empatnusabangsa/ppob/ppob-backend into development

Browse Source
This commit is contained in:
Ilham Dwi Pratama S
2022-01-24 15:34:29 +07:00
parent 7828de4d1d 7a0ba0eab7
commit 7df999b455
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/users/users.service.ts
View File

@@ -309,7 +309,7 @@ export class UsersService {
const baseQuery = this.usersRepository
.createQueryBuilder('user')
.where(
'user.id != :id and user.superior_id = :superior and status_approval = :status and is_rejected is false',
'user.id != :id and status_approval = :status and is_rejected is false',
{
id: superrior.userId,
status: superrior.userId,
@@ -569,7 +569,7 @@ export class UsersService {
async confirmationUser(id: string, user: string, status: string) {
try {
const dataUser = await this.usersRepository.findOneOrFail(id);
const supervisorUser = await this.usersRepository.findOneOrFail(id);
const supervisorUser = await this.findExist(user);
if (status == 'approved') {
dataUser.status_approval = supervisorUser.superior.id;