|
@@ -475,7 +475,12 @@ class Project extends Base_Controller {
|
|
|
$value['sectionList'] = array();
|
|
|
$temp[$value['id']] = $value;
|
|
|
if (isset($value['no']) && $value['no'] !== '') $value['company'] = $value['no'];
|
|
|
- $temp2[$value['cId']] = array('company'=>$value['company'],'lampcount'=>$value['lampcount'],'cId'=>$value['cId'],'projectList'=>array());
|
|
|
+ if (isset($temp2[$value['cId']])) {
|
|
|
+ $temp2[$value['cId']]['lampcount'] += $value['lampcount'];
|
|
|
+ }else{
|
|
|
+ $temp2[$value['cId']] = array('company'=>$value['company'],'lampcount'=>$value['lampcount'],'cId'=>$value['cId'],'projectList'=>array());
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
$projectIdArr = array_column($data, 'id');
|
|
|
$sectionWhere['projectid'] = $projectIdArr;
|