diff --git a/src/product/product.service.ts b/src/product/product.service.ts
index 4cebe51..da8e81a 100644
--- a/src/product/product.service.ts
+++ b/src/product/product.service.ts
@@ -15,6 +15,7 @@ import { productType } from '../helper/enum-list';
 import { UpdatePriceProductDto } from './dto/product/update-price-product.dto';
 import { UsersService } from '../users/users.service';
 import { SupplierService } from '../users/supplier/supplier.service';
+import { type } from 'os';
 
 export class ProductService {
   constructor(
@@ -96,7 +97,7 @@ export class ProductService {
 
   async findAllBySubCategories(page, subCategories, supplier) {
     if (supplier != 'null' && !supplier) {
-      supplier = await this.supplierService.findByActive();
+      supplier = (await this.supplierService.findByActive()).id;
     }
     const baseQuery = this.productRepository
       .createQueryBuilder('product')
@@ -111,7 +112,8 @@ export class ProductService {
         'current_price.partner_id is null',
       );
 
-    if (subCategories != 'null' && !subCategories) {
+    if (subCategories != 'null' && subCategories) {
+      console.log(!subCategories,"testingan")
       baseQuery.where('product.sub_categories_id = :id', {
         id: subCategories,
       });