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

Merge branch 'development' into 'devops-staging'

Browse Source 
Development

See merge request empatnusabangsa/ppob/ppob-backend!106
This commit is contained in:
ilham dwi pratama 2022-01-24 09:10:43 +00:00
commit ece11e8fe3
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -571,8 +571,13 @@ export class UsersService {
const dataUser = await this.usersRepository.findOneOrFail(id); const dataUser = await this.usersRepository.findOneOrFail(id);
const supervisorUser = await this.findExist(user); const supervisorUser = await this.findExist(user);
if (status == 'approved') { if (status == 'approved') {
if (supervisorUser.roles.name == 'Admin') {
dataUser.status_approval = 'Done';
}else {
dataUser.status_approval = supervisorUser.superior.id; dataUser.status_approval = supervisorUser.superior.id;
}
} else if (status == 'resend') { } else if (status == 'resend') {
dataUser.is_rejected = false; dataUser.is_rejected = false;
} else { } else {