From 04eabec632494e2dddbbb353c7714e5967107b17 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sun, 22 Sep 2024 11:45:25 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BD=BF=E7=94=A8withTrashed=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E6=9F=A5=E8=AF=A2=E5=B8=A6=E5=88=A0=E9=99=A4=E6=A0=87?=
 =?UTF-8?q?=E8=AE=B0=E7=9A=84=E4=BA=A7=E5=93=81=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lists/store_order_cart_info/StoreOrderCartInfoLists.php   | 2 +-
 app/admin/lists/warehouse_product/WarehouseProductLists.php   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/admin/lists/store_order_cart_info/StoreOrderCartInfoLists.php b/app/admin/lists/store_order_cart_info/StoreOrderCartInfoLists.php
index 7a6dab6aa..e2441d5e6 100644
--- a/app/admin/lists/store_order_cart_info/StoreOrderCartInfoLists.php
+++ b/app/admin/lists/store_order_cart_info/StoreOrderCartInfoLists.php
@@ -53,7 +53,7 @@ class StoreOrderCartInfoLists extends BaseAdminDataLists implements ListsSearchI
         return StoreOrderCartInfo::where($this->searchWhere)
             ->field('id,oid,uid,product_id,store_id,cart_num,price,total_price,create_time')->limit($this->limitOffset, $this->limitLength)
             ->select()->each(function ($item) {
-                $find=StoreProduct::where('id',$item['product_id'])->field('image,unit,store_name,store_info')->find();
+                $find=StoreProduct::where('id',$item['product_id'])->field('image,unit,store_name,store_info')->withTrashed()->find();
                 $item['nickname']='无';
                 $item['mobile']='';
                 if($find){
diff --git a/app/admin/lists/warehouse_product/WarehouseProductLists.php b/app/admin/lists/warehouse_product/WarehouseProductLists.php
index db24996c7..5ca083b90 100644
--- a/app/admin/lists/warehouse_product/WarehouseProductLists.php
+++ b/app/admin/lists/warehouse_product/WarehouseProductLists.php
@@ -52,7 +52,7 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt
     {
         if ($this->request->get('product_id')) {
             $product_id = $this->request->get('product_id');
-            $ids = StoreProduct::where('store_name', 'like', '%' . $product_id . '%')->column('id');
+            $ids = StoreProduct::where('store_name', 'like', '%' . $product_id . '%')->withTrashed()->column('id');
             if ($ids) {
                 $this->searchWhere[] = ['product_id', 'in', $ids];
                 $this->ids = $ids;
@@ -62,7 +62,7 @@ class WarehouseProductLists extends BaseAdminDataLists implements ListsSearchInt
         }
         if ($this->request->get('bar_code')) {
             $bar_code = $this->request->get('bar_code');
-            $ids = StoreProduct::where('bar_code', 'like', '%' . $bar_code . '%')->column('id');
+            $ids = StoreProduct::where('bar_code', 'like', '%' . $bar_code . '%')->withTrashed()->column('id');
             if ($ids) {
                 $this->searchWhere[] = ['product_id', 'in', $ids];
                 $this->ids = $ids;