|
@@ -883,7 +883,7 @@ class Home extends Base_Controller {
|
|
|
|
|
|
$join[] = ['table'=>'global_location as G1','cond'=>'G2.id = G1.pid','type'=>'left'];
|
|
|
$join[] = ['table'=>'project as P','cond'=>'G1.id = P.cityid AND G1.level = 4','type'=>'left'];
|
|
|
- $join[] = ['table'=>'project as P','cond'=>'G1.id = P.cityid AND G1.level = 4','type'=>'left'];
|
|
|
+ // $join[] = ['table'=>'project as P','cond'=>'G1.id = P.cityid AND G1.level = 4','type'=>'left'];
|
|
|
$join[] = ['table'=>'lampinfo as L','cond'=>'L.projectid = P.id','type'=>'left'];
|
|
|
// $join[] = ['table'=>'global_location as G2','cond'=>'G2.id = G1.pid','type'=>'left'];
|
|
|
$list = $this->Global_location_model->get_list_by_join($where, 'G2.id,G2.english_name as name,count(L.id) as lampcount',NULL, NULL, $join, NULL, 'G2.id', 'G2');
|