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

变更数据



查看合并请求 !3230

@@ -54,7 +54,11 @@ class TicketUploadDataController extends BaseController
             'project_id.required' => 'project_id不能为空',
         ]);
         $data = $this->model->lists($this->map, $this->page, $this->row, $this->order);
+
         if(!isset($this->param['project_type']) || empty($this->param['project_type'])) {
+            $this->param['project_type'] = 2;
+        }
+        if($this->param['project_type'] == 2){
             ProjectServer::useProject($this->map['project_id']);
             if(!empty($data) && !empty($data['list'])){
                 foreach ($data['list'] as &$item) {