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

变更数据



查看合并请求 !2862

@@ -50,10 +50,39 @@ 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']);
+        }
         $this->response('success', Code::SUCCESS, $data);
         $this->response('success', Code::SUCCESS, $data);
     }
     }
 
 
     /**
     /**
+     * @remark :获取分类名称
+     * @name   :cateText
+     * @author :lyh
+     * @method :post
+     * @time   :2025/9/29 17:18
+     */
+    public function cateText($type,$category_id)
+    {
+        if(!empty($category_id)){
+            return '';
+        }else{
+            $filed = 'name';
+            if($type == 1){
+                $cateModel = new Category();
+                $filed = 'title';
+            }elseif ($type == 2){
+                $cateModel = new BlogCategory();
+            }else{
+                $cateModel  = new NewsCategory();
+            }
+            $cateArr = $cateModel->selectField(['id'=>['in',$category_id]],$filed);
+            return implode(',',$cateArr);
+        }
+    }
+
+    /**
      * @remark :获取数据详情
      * @remark :获取数据详情
      * @name   :info
      * @name   :info
      * @author :lyh
      * @author :lyh