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

Lyh server



查看合并请求 !2881

@@ -53,6 +53,7 @@ class TicketUploadDataController extends BaseController
         ProjectServer::useProject($this->map['project_id']);
         ProjectServer::useProject($this->map['project_id']);
         if(!empty($data) && !empty($data['list'])){
         if(!empty($data) && !empty($data['list'])){
             foreach ($data['list'] as &$item) {
             foreach ($data['list'] as &$item) {
+                $item = $this->getHandleFileImage($item);
                 $item['text']['cate_name'] = $this->cateText($item['type'],$item['text']['category_id'] ?? []);
                 $item['text']['cate_name'] = $this->cateText($item['type'],$item['text']['category_id'] ?? []);
             }
             }
         }
         }
@@ -61,13 +62,33 @@ class TicketUploadDataController extends BaseController
     }
     }
 
 
     /**
     /**
+     * @remark :处理数据
+     * @name   :getHandleFileImage
+     * @author :lyh
+     * @method :post
+     * @time   :2025/9/25 16:53
+     */
+    public function getHandleFileImage($v){
+        if($v['type'] == 1){
+            if(!empty($v['text']['image'])){
+                foreach ($v['text']['image'] as $gallery_k => $gallery_v){
+                    $gallery_v['url'] = getImageUrl($gallery_v['url']);
+                    $v['text']['image'][$gallery_k] = $gallery_v;
+                }
+            }
+        }else{
+            $v['text']['image'] = getImageUrl($v['text']['image']);
+        }
+        return $v;
+    }
+    /**
      * @remark :获取分类名称
      * @remark :获取分类名称
      * @name   :cateText
      * @name   :cateText
      * @author :lyh
      * @author :lyh
      * @method :post
      * @method :post
      * @time   :2025/9/29 17:18
      * @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)){
         if(empty($category_id)){
             return '';
             return '';
@@ -75,17 +96,32 @@ class TicketUploadDataController extends BaseController
             $filed = 'name';
             $filed = 'name';
             if($type == 1){
             if($type == 1){
                 $cateModel = new Category();
                 $cateModel = new Category();
+                $keywodModel = new KeyWord();
                 $filed = 'title';
                 $filed = 'title';
             }elseif ($type == 2){
             }elseif ($type == 2){
                 $cateModel = new BlogCategory();
                 $cateModel = new BlogCategory();
             }else{
             }else{
                 $cateModel  = new NewsCategory();
                 $cateModel  = new NewsCategory();
             }
             }
-            $cateArr = $cateModel->selectField(['id'=>['in',$category_id]],$filed);
-            return implode(',',$cateArr);
+            if($is_array){
+                $cate_arr = $cateModel->whereIn('id', (array)$category_id)
+                    ->pluck($filed, 'id')
+                    ->toArray();
+                if($type == 1){
+                    $keywod_arr = $keywodModel->whereIn('id', (array)$category_id)
+                        ->pluck($filed, 'id')
+                        ->toArray();
+                    return ['keywod_arr' => $keywod_arr, 'cate_arr' => $cate_arr];
+                }
+                return ['cate_arr' => $cate_arr];
+            }else{
+                $cateArr = $cateModel->selectField(['id'=>['in',$category_id]],$filed);
+                return implode(',',$cateArr);
+            }
         }
         }
     }
     }
 
 
+
     /**
     /**
      * @remark :获取数据详情
      * @remark :获取数据详情
      * @name   :info
      * @name   :info
@@ -100,8 +136,13 @@ class TicketUploadDataController extends BaseController
         ], [
         ], [
             'id.required' => 'id不能为空',
             'id.required' => 'id不能为空',
         ]);
         ]);
-        $data = $this->model->read($this->param);
-        $this->response('success', Code::SUCCESS, $data);
+        $info = $this->model->read($this->param);
+        if($info === false){
+            $this->response('当前数据不存在或已被删除',Code::SYSTEM_ERROR);
+        }
+        $info['text']['cate_name'] = $this->cateText($info['type'],$info['text']['category_id'] ?? [],true);
+        $info = $this->getHandleFileImage($info);
+        $this->response('success', Code::SUCCESS, $info);
     }
     }
 
 
     /**
     /**

@@ -69,7 +69,7 @@ class TicketUploadDataLogic extends BaseLogic
             if(!empty($v['text']['image'])){
             if(!empty($v['text']['image'])){
                 foreach ($v['text']['image'] as $gallery_k => $gallery_v){
                 foreach ($v['text']['image'] as $gallery_k => $gallery_v){
                     $gallery_v['url'] = getImageUrl($gallery_v['url']);
                     $gallery_v['url'] = getImageUrl($gallery_v['url']);
-                    $info['text']['image'][$gallery_k] = $gallery_v;
+                    $v['text']['image'][$gallery_k] = $gallery_v;
                 }
                 }
             }
             }
         }else{
         }else{