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

变更数据



查看合并请求 !2870

@@ -49,7 +49,7 @@ class TicketUploadDataLogic extends BaseLogic
         if(!empty($data) && !empty($data['list'])){
             foreach ($data['list'] as &$v){
                 $v = $this->getHandleFileImage($v);
-                $v['text']['cate_text'] = $this->cateText($v['type'],$v['text']['category_id'] ?? []);
+                $v['text']['cate_name'] = $this->cateText($v['type'],$v['text']['category_id'] ?? []);
             }
         }
         DB::disconnect('custom_mysql');
@@ -84,7 +84,7 @@ class TicketUploadDataLogic extends BaseLogic
      * @method :post
      * @time   :2025/9/29 17:18
      */
-    public function cateText($type,$category_id)
+    public function cateText($type,$category_id,$is_array = false)
     {
         if(!empty($category_id)){
             return '';
@@ -98,8 +98,12 @@ class TicketUploadDataLogic extends BaseLogic
             }else{
                 $cateModel  = new NewsCategory();
             }
-            $cateArr = $cateModel->selectField(['id'=>['in',$category_id]],$filed);
-            return implode(',',$cateArr);
+            if($is_array){
+                return $cateModel::pluck($filed, 'id')->toArray();
+            }else{
+                $cateArr = $cateModel->selectField(['id'=>['in',$category_id]],$filed);
+                return implode(',',$cateArr);
+            }
         }
     }
 
@@ -116,6 +120,7 @@ class TicketUploadDataLogic extends BaseLogic
             $this->fail('当前数据不存在或已被删除');
         }
         $info = $this->getHandleFileImage($info);
+        $info['text']['cate'] = $this->cateText($info['type'],$info['text']['category_id'] ?? []);
         return $this->success($info);
     }