From 41272e4ba39b7aa9685834ec626daf59baac13c0 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 18 May 2024 18:08:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/operation/OpurchaseclassController.php | 3 ++-
 app/admin/lists/operation/OpurchaseclassofferLists.php      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/admin/controller/operation/OpurchaseclassController.php b/app/admin/controller/operation/OpurchaseclassController.php
index a5eaf94..67f4e69 100644
--- a/app/admin/controller/operation/OpurchaseclassController.php
+++ b/app/admin/controller/operation/OpurchaseclassController.php
@@ -94,7 +94,8 @@ class OpurchaseclassController extends BaseAdminController
         $is_push = $this->request->get('is_push',0);
         $where['pid']=$id;
         $where['is_push'] = $is_push;
-        $res = Opurchaseinfo::where($where)->page($page_no, $page_size)->select()->each(function ($item) {
+        $res = Opurchaseinfo::where($where)->page($page_no, $page_size)->select()
+        ->each(function ($item) {
             $item['sys_labels_arr']='';
             $find = Goods::where('id', $item['goods'])->with('unitName')->find();
             if($find){
diff --git a/app/admin/lists/operation/OpurchaseclassofferLists.php b/app/admin/lists/operation/OpurchaseclassofferLists.php
index ac76986..ef507a9 100644
--- a/app/admin/lists/operation/OpurchaseclassofferLists.php
+++ b/app/admin/lists/operation/OpurchaseclassofferLists.php
@@ -31,7 +31,7 @@ class OpurchaseclassofferLists extends BaseAdminDataLists implements ListsSearch
     public function setSearch(): array
     {
         return [
-            '=' => ['is_adopt'],
+            '=' => ['is_adopt','is_push'],
         ];
     }