|
@@ -52,8 +52,7 @@ class Goodup extends Base
|
|
|
$where[]=['gb.companyNo',"like","%$companyNo%"];
|
|
|
$condit[]=['a.companyNo',"like","%$companyNo%"];
|
|
|
}
|
|
|
- $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo'] !=="" ? trim($this->post['supplierNo'])
|
|
|
- :"";
|
|
|
+ $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo'] !=="" ? trim($this->post['supplierNo']) :"";
|
|
|
if($supplierNo!==""){
|
|
|
$where[]=['gb.supplierNo',"like","%$supplierNo%"];
|
|
|
$condit[]=['a.supplierNo',"like","%$supplierNo%"];
|
|
@@ -64,8 +63,7 @@ class Goodup extends Base
|
|
|
$where[]=['gb.supplierNo',"in",$suppliernos];
|
|
|
$condit[]=['a.supplierNo',"in",$suppliernos];
|
|
|
}
|
|
|
- $company = isset($this->post['company']) && $this->post['company'] !=="" ? trim($this->post['company'])
|
|
|
- :"";
|
|
|
+ $company = isset($this->post['company']) && $this->post['company'] !=="" ? trim($this->post['company']) :"";
|
|
|
if($company!==""){
|
|
|
$companyNos = Db::name("business")->where([["company","like","%$company%"]])->column("companyNo");
|
|
|
$where[]=['gb.companyNo',"in",$companyNos];
|
|
@@ -165,6 +163,8 @@ class Goodup extends Base
|
|
|
->where(['is_del' => 0, 'exam_status' => 6])//exam_status==6表示上线审核成功
|
|
|
->column('id', 'spuCode');
|
|
|
|
|
|
+ $account = checkHasAccountBySupplierNos(array_column($list, 'supplierNo'));
|
|
|
+
|
|
|
foreach ($list as $value){
|
|
|
$value["cat_info"]= made($value['cat_id'],[]);
|
|
|
$brand=Db::name("brand")->where(["id"=>$value['brand_id']])->find();
|
|
@@ -183,6 +183,8 @@ class Goodup extends Base
|
|
|
|
|
|
$value['charger_company_name'] = implode('/', array_column(GetPart($value['itemid']), 'name'));
|
|
|
|
|
|
+ $value['has_account'] = (int)isset($account[$value['supplierNo']]);
|
|
|
+
|
|
|
$data[] = $value;
|
|
|
}
|
|
|
return app_show(0,"获取成功",['list'=>$data,'count'=>$count]);
|