mkm/engineering
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新细节

Browse Source
This commit is contained in:
yaooo 2023-12-16 10:08:08 +08:00
parent c27b1adbf9
commit 63f823700d
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/adminapi/lists/contract/ProcurementContractLists.php
View File

@ -47,8 +47,12 @@ class ProcurementContractLists extends BaseAdminDataLists implements ListsSearch
$queryWhere = []; $queryWhere = [];
if (!empty($this->params['contract_cate'])) { if (!empty($this->params['contract_cate'])) {
$queryWhere['contract_cate'] = $this->params['contract_cate']; $queryWhere['contract_cate'] = $this->params['contract_cate'];
} else {
$queryWhere['contract_cate'] = 2;
}
if (!empty($this->params['all'])) {
unset($queryWhere['contract_cate']);
} }
$queryWhere['contract_cate'] = 1;
return $queryWhere; return $queryWhere;
} }

2
app/common/model/contract/SubcontractingContractNegotiation.php
View File

@ -32,7 +32,7 @@ class SubcontractingContractNegotiation extends BaseModel
public function contract() public function contract()
{ {
return $this->belongsTo(\app\common\model\contract\SubcontractingContract::class, 'subcontracting_contract_id'); return $this->belongsTo(\app\common\model\contract\ProcurementContract::class, 'subcontracting_contract_id');
} }
} }