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

更新

Browse Source
This commit is contained in:
mkm 2024-05-17 09:14:36 +08:00
parent 6b4e14905c
commit 1325187237
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/admin/lists/operation/OpurchaseclassLists.php
View File

@ -47,8 +47,10 @@ class OpurchaseclassLists extends BaseAdminDataLists implements ListsSearchInter
$where=[];
$merchant=$this->request->get('merchant');
if($merchant){
$mer_id= Merchant::where('mer_id','like','%'.$merchant.'%')->column('mer_id');
$where['mer_id']=['in',$mer_id];
$mer_id= Merchant::where('mer_name','like','%'.$merchant.'%')->column('mer_id');
if($mer_id){
$where[]=['merchant','in',$mer_id];
}
}
$this->where=$where;
return Opurchaseclass::where($this->searchWhere)
@ -59,8 +61,7 @@ class OpurchaseclassLists extends BaseAdminDataLists implements ListsSearchInter
->select()->each(function($data){
$merchant = Merchant::field('mer_name')->where('mer_id',$data['merchant'])->findOrEmpty();
$data['merchant_name'] = !$merchant->isEmpty() ? $merchant['mer_name'] : '';
})
->toArray();
})?->toArray();
}