变更数据

@@ -54,14 +54,16 @@ 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);
-        ProjectServer::useProject($this->map['project_id']);
-        if(!empty($data) && !empty($data['list'])){
-            foreach ($data['list'] as &$item) {
-                $item = $this->getHandleFileImage($item);
-                $item['text']['cate_name'] = $this->cateText($item['type'],$item['text']['category_id'] ?? []);
+        if(!isset($this->param['project_type']) || empty($this->param['project_type'])) {
+            ProjectServer::useProject($this->map['project_id']);
+            if(!empty($data) && !empty($data['list'])){
+                foreach ($data['list'] as &$item) {
+                    $item = $this->getHandleFileImage($item);
+                    $item['text']['cate_name'] = $this->cateText($item['type'],$item['text']['category_id'] ?? []);
+                }
             }
             }
+            DB::disconnect('custom_mysql');
         }
         }
-        DB::disconnect('custom_mysql');
         $this->response('success', Code::SUCCESS, $data);
         $this->response('success', Code::SUCCESS, $data);
     }
     }
 
 

@@ -46,21 +46,21 @@ class TicketUploadDataLogic extends BaseLogic
      * @time   :2025/9/25 14:17
      * @time   :2025/9/25 14:17
      */
      */
     public function getDataList($map = [],$page = 1,$row = 20,$order = 'id'){
     public function getDataList($map = [],$page = 1,$row = 20,$order = 'id'){
-        if(isset($this->map['text']) && !empty($this->map['text'])){
-            $this->map['text'] = ['like','%'.$this->map['text'].'%'];
+        if(isset($map['text']) && !empty($map['text'])){
+            $map['text'] = ['like','%'.$map['text'].'%'];
         }
         }
-        ProjectServer::useProject($map['project_id']);
-        if(empty($map['type'])){
-            $map['type'] = $this->model::TYPE_SIX;//6.0数据
+        if(!isset($map['project_type']) || empty($map['project_type'])){
+            $map['project_type'] == $this->model::TYPE_SIX;
         }
         }
         $data = $this->model->lists($map,$page,$row,$order);
         $data = $this->model->lists($map,$page,$row,$order);
-        if(!empty($data) && !empty($data['list'])){
-            foreach ($data['list'] as &$v){
-                $v = $this->getHandleFileImage($v);
-                $v['text']['cate_name'] = $this->cateText($v['type'],$v['text']['category_id'] ?? []);
+        if($map['project_type'] == $this->model::TYPE_SIX){
+            if(!empty($data) && !empty($data['list'])){
+                foreach ($data['list'] as &$v){
+                    $v = $this->getHandleFileImage($v);
+                    $v['text']['cate_name'] = $this->cateText($v['type'],$v['text']['category_id'] ?? []);
+                }
             }
             }
         }
         }
-        DB::disconnect('custom_mysql');
         return $this->success($data);
         return $this->success($data);
     }
     }