合并分支 'lyh-server' 到 'master'

变更数据



查看合并请求 !2864

@@ -50,8 +50,10 @@ class TicketUploadDataController extends BaseController
             'project_id.required' => 'project_id不能为空',
             'project_id.required' => 'project_id不能为空',
         ]);
         ]);
         $data = $this->model->lists($this->map, $this->page, $this->row, $this->order);
         $data = $this->model->lists($this->map, $this->page, $this->row, $this->order);
-        foreach ($data as &$item) {
-            $item['text']['cate_name'] = $this->cateText($item['type'],$item['text']['category_id'] ?? []);
+        if(!empty($data) && !empty($data['list'])){
+            foreach ($data['list'] as &$item) {
+                $item['text']['cate_name'] = $this->cateText($item['type'],$item['text']['category_id'] ?? []);
+            }
         }
         }
         $this->response('success', Code::SUCCESS, $data);
         $this->response('success', Code::SUCCESS, $data);
     }
     }