Merge remote-tracking branch 'origin/development' into development
This commit is contained in:
commit
7aee976de6
|
@ -413,6 +413,7 @@ export class UsersService {
|
||||||
.leftJoinAndSelect('users.roles', 'roles')
|
.leftJoinAndSelect('users.roles', 'roles')
|
||||||
.leftJoinAndSelect('users.superior', 'superior')
|
.leftJoinAndSelect('users.superior', 'superior')
|
||||||
.leftJoinAndSelect('users.userDetail', 'userDetail')
|
.leftJoinAndSelect('users.userDetail', 'userDetail')
|
||||||
|
.leftJoinAndSelect('users.partner', 'partner')
|
||||||
.where('users.id = :id', {
|
.where('users.id = :id', {
|
||||||
id: id,
|
id: id,
|
||||||
})
|
})
|
||||||
|
@ -432,6 +433,14 @@ export class UsersService {
|
||||||
'userDetail.identity_number',
|
'userDetail.identity_number',
|
||||||
'userDetail.image_identity',
|
'userDetail.image_identity',
|
||||||
'userDetail.image_store',
|
'userDetail.image_store',
|
||||||
|
'partner.id',
|
||||||
|
'partner.name',
|
||||||
|
'partner.code',
|
||||||
|
'partner.npwp',
|
||||||
|
'partner.address',
|
||||||
|
'partner.phone_number',
|
||||||
|
'partner.callback_url'
|
||||||
|
|
||||||
])
|
])
|
||||||
.getOne();
|
.getOne();
|
||||||
const coa = await this.coaService.findByUser(id, coaType.WALLET);
|
const coa = await this.coaService.findByUser(id, coaType.WALLET);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user