Merge branch 'gsb-marketplat-mag' of gitlab.gongsibao.com:jiangyong/zhichan into gsb-marketplat-mag

gsb-marketplat-mag/app/base/service/impl/aggregation/productSve.js

@@ -31,7 +31,7 @@ class ProductService extends ServiceBase {
     }
     }
     let products = await this.dao.model.findAll({
     let products = await this.dao.model.findAll({
       attributes:["code","name"],
       attributes:["code","name"],
-      where:{product_type_id:type.id},raw:true
+      where:{product_type_id:type.id,is_enabled:1},raw:true
     });
     });
     return system.getResult(products)
     return system.getResult(products)
   }
   }