diff --git a/src/users/entities/supplier.entity.ts b/src/users/entities/supplier.entity.ts index 41dddfb..b265ca3 100644 --- a/src/users/entities/supplier.entity.ts +++ b/src/users/entities/supplier.entity.ts @@ -19,4 +19,6 @@ export class Supplier extends BaseModel { status: boolean; coa: COA; + + coa_undistribute: COA; } diff --git a/src/users/supplier/supplier.service.ts b/src/users/supplier/supplier.service.ts index 68bef24..00ff8c0 100644 --- a/src/users/supplier/supplier.service.ts +++ b/src/users/supplier/supplier.service.ts @@ -139,7 +139,13 @@ export class SupplierService { 'coa', `coa.supplier = supplier.id and coa.type = '2'`, ) - .select(['supplier', 'coa.amount']); + .leftJoinAndMapOne( + 'supplier.coa_undistribute', + COA, + 'coa_undistribute', + `coa_undistribute.supplier = supplier.id and coa_undistribute.type = '9'`, + ) + .select(['supplier', 'coa.amount', 'coa_undistribute.amount']); const data = await baseQuery .skip(page * 10)