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

变更数据



查看合并请求 !2865

@@ -46,10 +46,12 @@ class TicketUploadDataLogic extends BaseLogic
         }
         }
         ProjectServer::useProject($map['project_id']);
         ProjectServer::useProject($map['project_id']);
         $data = $this->model->lists($map,$page,$row,$order);
         $data = $this->model->lists($map,$page,$row,$order);
-        foreach ($data as &$v){
+        if(!empty($data) && !empty($data['list'])){
+            foreach ($data['list'] as &$v){
                 $v = $this->getHandleFileImage($v);
                 $v = $this->getHandleFileImage($v);
                 $v['text']['cate_text'] = $this->cateText($v['type'],$v['text']['category_id'] ?? []);
                 $v['text']['cate_text'] = $this->cateText($v['type'],$v['text']['category_id'] ?? []);
             }
             }
+        }
         DB::disconnect('custom_mysql');
         DB::disconnect('custom_mysql');
         return $this->success($data);
         return $this->success($data);
     }
     }