From 0795325a9e9ba9c08d4644be8a10411495a844c3 Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Sat, 11 May 2024 18:47:04 +0800
Subject: [PATCH] update

---
 app/admin/logic/operation/OpurchaseclassLogic.php   | 2 +-
 app/api/lists/operation/OpurchaseGoodsOfferList.php | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/admin/logic/operation/OpurchaseclassLogic.php b/app/admin/logic/operation/OpurchaseclassLogic.php
index 25a8072..4e355f2 100644
--- a/app/admin/logic/operation/OpurchaseclassLogic.php
+++ b/app/admin/logic/operation/OpurchaseclassLogic.php
@@ -200,7 +200,7 @@ class OpurchaseclassLogic extends BaseLogic
                     self::setError('报价未设置');
                     return false;
                 }
-                $find->is_adopt=1;
+                $find->is_adopt=2;
             }else{
                 $find->is_storage=1;
                 $find->notes=$notes;
diff --git a/app/api/lists/operation/OpurchaseGoodsOfferList.php b/app/api/lists/operation/OpurchaseGoodsOfferList.php
index a3ffd7c..b4c2663 100644
--- a/app/api/lists/operation/OpurchaseGoodsOfferList.php
+++ b/app/api/lists/operation/OpurchaseGoodsOfferList.php
@@ -42,12 +42,14 @@ class OpurchaseGoodsOfferList extends BaseAdminDataLists implements ListsSearchI
         $supplier_id=$this->request->userInfo['supplier']['id'] ?? 0;
 	    $params = $this->request->get();
 		if(isset($params['type']) && $params['type'] == 2){
-			$where[] = ['price','<>',''];
+			$where[] = ['price','<>',0];
+			$where[] = ['is_adopt','<>',0];
 		}else{
 			$where[] = ['price','=',''];
+			$where[] = ['is_adopt',0];
 		}
         if(!$supplier_id) return [];
-        return OpurchaseGoodsOffer::where($this->searchWhere)->where('supplier_id',$supplier_id)->where($where)->where('is_adopt',0)
+        return OpurchaseGoodsOffer::where($this->searchWhere)->where('supplier_id',$supplier_id)->where($where)
 	        ->with('goods')
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])