Merge remote-tracking branch 'origin/develop' into develop

app/AdminSupplier/Renderable/SelectProduct.php

@@ -26,7 +26,10 @@ class SelectProduct extends LazyRenderable
 			$grid->disableBatchActions();
 
 			//$grid->model()->where('status', ProductStatus::ON_SALE);
-			$grid->model()->where('supplier_id', Admin::user()->id);
+			$grid->model()->where([
+				'supplier_id' => Admin::user()->id,
+				'status' => ProductStatus::ON_SALE
+			]);
 			$grid->quickSearch(['title', 'supplier.name'])->placeholder('搜索产品名称、供应商');
 
 			$grid->column('id');