diff --git a/app/adminapi/lists/contract/ContractLists.php b/app/adminapi/lists/contract/ContractLists.php index 4918f614c..7912fc657 100644 --- a/app/adminapi/lists/contract/ContractLists.php +++ b/app/adminapi/lists/contract/ContractLists.php @@ -38,7 +38,7 @@ class ContractLists extends BaseAdminDataLists implements ListsSearchInterface public function setSearch(): array { return [ - '=' => ['c.contract_name', 'c.contract_type', 'c.contract_code'], + '=' => ['c.org_id', 'c.dept_id', 'c.contract_name', 'c.contract_type', 'c.contract_code'], ]; } @@ -58,9 +58,11 @@ class ContractLists extends BaseAdminDataLists implements ListsSearchInterface ->where($this->searchWhere) ->whereNull('c.delete_time') ->leftJoin('bid_buy_bidding_document bbbd','bbbd.id = c.buy_bidding_document_id') + ->leftJoin('orgs o','o.id = c.org_id') + ->leftJoin('dept d','d.id = c.dept_id') ->leftJoin('project p','p.id = bbbd.project_id') ->leftJoin('custom ct','ct.id = c.customer_id') - ->field('c.*, bbbd.project_id, p.name as project_name, p.project_code, ct.name as customer_name') + ->field('c.*, d.name as dept_name, o.name as org_name, bbbd.project_id, p.name as project_name, p.project_code, ct.name as customer_name') ->limit($this->limitOffset, $this->limitLength) ->order(['c.id' => 'desc']) ->select()->each(function($item, $key){ diff --git a/app/adminapi/lists/custom/CustomLists.php b/app/adminapi/lists/custom/CustomLists.php index 7442943d5..38f82d90a 100644 --- a/app/adminapi/lists/custom/CustomLists.php +++ b/app/adminapi/lists/custom/CustomLists.php @@ -39,7 +39,7 @@ class CustomLists extends BaseAdminDataLists implements ListsSearchInterface public function setSearch(): array { return [ - '=' => ['c.name', 'c.custom_type', 'c.phone', 'c.credit_rating', 'c.province', 'c.city', 'c.status'], + '=' => ['c.org_id', 'c.dept_id', 'c.name', 'c.custom_type', 'c.phone', 'c.credit_rating', 'c.province', 'c.city', 'c.status'], ]; }