Merge branch 'development' into 'devops-staging'
Development See merge request empatnusabangsa/ppob/ppob-backend!105
This commit is contained in:
commit
bb857a379f
|
@ -74,6 +74,7 @@ export class UsersService {
|
||||||
}
|
}
|
||||||
userData.superior = superior;
|
userData.superior = superior;
|
||||||
userData.status_approval = superior.superior.id;
|
userData.status_approval = superior.superior.id;
|
||||||
|
userData.is_active = false;
|
||||||
} else {
|
} else {
|
||||||
userData.superior = null;
|
userData.superior = null;
|
||||||
userData.partner = createUserDto.partner;
|
userData.partner = createUserDto.partner;
|
||||||
|
@ -410,6 +411,7 @@ export class UsersService {
|
||||||
'users.id',
|
'users.id',
|
||||||
'users.username',
|
'users.username',
|
||||||
'users.is_active',
|
'users.is_active',
|
||||||
|
'users.is_rejected',
|
||||||
'users.createdAt',
|
'users.createdAt',
|
||||||
'roles.id',
|
'roles.id',
|
||||||
'roles.name',
|
'roles.name',
|
||||||
|
|
Loading…
Reference in New Issue
Block a user