Merge branch 'development' into 'devops-staging'

Development

See merge request empatnusabangsa/ppob/ppob-backend!105
This commit is contained in:
ilham dwi pratama 2022-01-24 08:35:25 +00:00
commit bb857a379f

View File

@ -74,6 +74,7 @@ export class UsersService {
}
userData.superior = superior;
userData.status_approval = superior.superior.id;
userData.is_active = false;
} else {
userData.superior = null;
userData.partner = createUserDto.partner;
@ -410,6 +411,7 @@ export class UsersService {
'users.id',
'users.username',
'users.is_active',
'users.is_rejected',
'users.createdAt',
'roles.id',
'roles.name',