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

变更数据



查看合并请求 !3229

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