diff --git a/app/adminapi/lists/cost_project/CostApprovedProjectLists.php b/app/adminapi/lists/cost_project/CostApprovedProjectLists.php index c995516b6..4389f2667 100644 --- a/app/adminapi/lists/cost_project/CostApprovedProjectLists.php +++ b/app/adminapi/lists/cost_project/CostApprovedProjectLists.php @@ -20,7 +20,8 @@ use app\common\lists\ListsSearchInterface; use app\common\model\auth\Admin; use app\common\model\dept\Dept; - use app\common\model\financial\FinancialInvoice; +use app\common\model\dict\DictData; +use app\common\model\financial\FinancialInvoice; use app\common\model\financial\FinancialRefund; use app\common\model\financial\FinancialSettlement; use app\common\model\marketing\MarketingContract; @@ -62,11 +63,19 @@ */ public function lists(): array { - return MarketingContract::where($this->searchWhere)->where([ + $where=[ ['review_status','=', 1], ['contract_type','=',0], ['status','=',0] - ]) + ]; + $types=$this->request->get('type_value'); + if($types){ + $data=DictData::where('type_value',$types)->column('value'); + if($data){ + $where[]=['business_nature','in',$data]; + } + } + return MarketingContract::where($this->searchWhere)->where($where) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) ->select()