|
|
@@ -232,7 +232,9 @@ class Project extends \app\BaseController
|
|
|
$value['platform_name']=isset($info['platform_name'])?$info['platform_name']:"";
|
|
|
$value['platform_code']=isset($info['platform_code'])?$info['platform_code']:"";
|
|
|
$khinfo = Db::name("customer_info")->where(["companyNo"=>$value['khNo']])->find();
|
|
|
- $value['khName'] = isset($khinfo['CompanyName'])?$khinfo['CompanyName']:"";
|
|
|
+ $value['khName'] = isset($khinfo['companyName'])?$khinfo['companyName']:"";
|
|
|
+ $company = Db::name("business")->where(["companyNo"=>$info['companyNo']])->find();
|
|
|
+ $value['company'] = isset($company['company'])?$company['company']:"";
|
|
|
$data[]=$value;
|
|
|
}
|
|
|
return app_show(0,"获取成功",['list'=>$data,'count'=>$count]);
|
|
|
@@ -278,7 +280,7 @@ class Project extends \app\BaseController
|
|
|
$info['platform_code']=isset($plat['platform_code'])?$plat['platform_code']:"";
|
|
|
|
|
|
$khinfo = Db::name("customer_info")->where(["companyNo"=>$info['khNo']])->find();
|
|
|
- $info['khName'] = isset($khinfo['CompanyName'])?$khinfo['CompanyName']:"";
|
|
|
+ $info['khName'] = isset($khinfo['companyName'])?$khinfo['companyName']:"";
|
|
|
$company = Db::name("business")->where(["companyNo"=>$info['companyNo']])->find();
|
|
|
$info['company'] = isset($company['company'])?$company['company']:"";
|
|
|
|
