Merge pull request '修改商品列表查询' (#532) from dev into main

Reviewed-on: #532

app/admin/lists/store_product/StoreProductLists.php

@@ -91,6 +91,9 @@ class StoreProductLists extends BaseAdminDataLists implements ListsSearchInterfa
         if ($storeId > 0) {
             $is_true = SystemStore::isSelfOperate($storeId);
         }
+        if (!empty($this->params['product_status'])) {
+            $query->onlyTrashed();
+        }
         $list = $query->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()->each(function ($item) use ($is_warehouse, $userShip, $order_type, $is_true) {
@@ -199,6 +202,9 @@ class StoreProductLists extends BaseAdminDataLists implements ListsSearchInterfa
                 $query->where('is_show', 1);
             }
         }
+        if (!empty($this->params['product_status'])) {
+            $query->onlyTrashed();
+        }
         return $query->count();
     }