|
@@ -507,6 +507,7 @@ class Project extends Base_Controller {
|
|
$fields = 'projectname as project_name,
|
|
$fields = 'projectname as project_name,
|
|
projectid as project_no,
|
|
projectid as project_no,
|
|
address,
|
|
address,
|
|
|
|
+ company,
|
|
createtime as create_time,
|
|
createtime as create_time,
|
|
patrolinterval,
|
|
patrolinterval,
|
|
cityid,
|
|
cityid,
|
|
@@ -625,7 +626,7 @@ class Project extends Base_Controller {
|
|
// var_dump($data['weatherList']);die;
|
|
// var_dump($data['weatherList']);die;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- $data['company'] = $this->Company_model->get_data_by_id($data['company_id'], 'name');
|
|
|
|
|
|
+ // $data['company'] = $this->Company_model->get_data_by_id($data['company_id'], 'name');
|
|
|
|
|
|
if (empty($version)) {
|
|
if (empty($version)) {
|
|
$data['location'] = $location_ch;
|
|
$data['location'] = $location_ch;
|