wzh 5 年之前
父節點
當前提交
ebb27a4af2
共有 1 個文件被更改,包括 4 次插入4 次删除
  1. 4 4
      api/application/controllers/Project.php

+ 4 - 4
api/application/controllers/Project.php

@@ -405,8 +405,8 @@ class Project extends Base_Controller {
                 $sectionList = $this->Lamp_model->get_list(['projectid'=>$projectIdArr], 'section as name,projectid',NULL, NULL, 'convert(section using gbk) asc', 'projectid,section');
                 foreach ($sectionList as $key => $value) {
                     if (isset($temp[$value['projectid']])) {
-                        $temp[$value['projectid']]['sectionList'][] = $value;
-                        // unset($value['projectid']);
+                        unset($value['projectid']);
+                        $temp[$sectionList[$key]['projectid']]['sectionList'][] = $value;
                     }
                 }
                 $data = array_values($temp);
@@ -451,14 +451,14 @@ class Project extends Base_Controller {
                 foreach ($sectionList as $key => $value) {
                     if (isset($temp[$value['projectid']])) {
                         unset($value['projectid']);
-                        $temp[$value['projectid']]['sectionList'][] = $value;
+                        $temp[$sectionList[$key]['projectid']]['sectionList'][] = $value;
                     }
                 }
                 $temp = array_values($temp);
                 foreach ($temp as $key => $value) {
                     if (isset($temp2[$value['company']])) {
                         unset($value['company']);
-                        $temp[$value['company']]['projectList'][] = $value;
+                        $temp[$temp[$key]['company']]['projectList'][] = $value;
                     }
                 }
                 $data = array_values($temp2);