变更数据

@@ -4,6 +4,7 @@ namespace App\Http\Logic\Bside\Blog;
 
 use App\Http\Logic\Bside\BaseLogic;
 use App\Models\Blog\Blog;
+use App\Models\Blog\BlogExtendInfo;
 use App\Models\RouteMap\RouteMap;
 use App\Models\Template\BTemplate;
 use Illuminate\Support\Facades\DB;
@@ -102,6 +103,7 @@ class BlogLogic extends BaseLogic
         $info['label_name'] = $blogLabelLogic->getLabelName($info['label_id']);
         $info['image_link'] = getImageUrl($info['image'],$this->user['storage_type'],$this->user['project_location']);
         $info['og_image'] = getImageUrl(empty($info['og_image']) ? $info['image'] : $info['og_image'],$this->user['storage_type'],$this->user['project_location']);
+        $info['extend'] = $this->model->getExtendInfo($info['id']);
         return $this->success($info);
     }
 
@@ -142,6 +144,9 @@ class BlogLogic extends BaseLogic
                     $this->delRoute($id);
                     RouteMap::delRoute(RouteMap::SOURCE_BLOG, $id, $this->user['project_id']);
                     $this->model->del(['id' => $id]);
+                    //删除扩展字段
+                    $extendInfoModel = new BlogExtendInfo();
+                    $extendInfoModel->del(['blog_id'=>$id]);
                 }
             }
             DB::commit();

@@ -3,7 +3,6 @@
 namespace App\Models\Blog;
 
 use App\Models\Base;
-use App\Models\News\NewsExtendInfo;
 use App\Models\User\User;
 
 class Blog extends Base
@@ -23,7 +22,39 @@ class Blog extends Base
         }
         return $value;
     }
-
+    /**
+     * @remark :扩展字段根据type返回类型
+     * @name   :setTypValues
+     * @author :lyh
+     * @method :post
+     * @time   :2023/12/6 14:43
+     */
+    public function getExtendInfo($news_id){
+        $extendModel = new BlogExtend();
+        $list = $extendModel->list(['status'=>1],'id',['id','type','key','title']);
+        if(empty($list)){
+            return [];
+        }
+        $extendInfoModel = new BlogExtendInfo();
+        $infoList = $extendInfoModel->list(['news_id'=>$news_id],'created_at');
+        foreach ($list as $k=>$v){
+            if($v['type'] == 3 || $v['type'] == 4){
+                $v['values'] = [];
+            }else{
+                $v['values'] = '';
+            }
+            if(!empty($infoList)){
+                foreach ($infoList as $values){
+                    if($v['key'] == $values['key']){
+                        $v = $this->setTypValues($v,$values);
+                        break;
+                    }
+                }
+            }
+            $list[$k] = $v;
+        }
+        return $list;
+    }
     /**
      * @remark :保存扩展字段
      * @name   :saveExtend
@@ -31,10 +62,10 @@ class Blog extends Base
      * @method :post
      * @time   :2023/11/9 15:02
      */
-    public function saveExtendInfo($news_id,$extend,$project_id){
+    public function saveExtendInfo($blog_id,$extend,$project_id){
         //先删除以前的数据
-        $extendInfoModel = new NewsExtendInfo();
-        $extendInfoModel->del(['news_id'=>$news_id]);
+        $extendInfoModel = new BlogExtendInfo();
+        $extendInfoModel->del(['blog_id'=>$blog_id]);
         if(empty($extend)) {
             return true;
         }
@@ -42,7 +73,7 @@ class Blog extends Base
             if(empty($v['values'])){
                 continue;
             }
-            $v = $this->saveHandleExtend($v,$news_id,$project_id);
+            $v = $this->saveHandleExtend($v,$blog_id,$project_id);
             $extendInfoModel->add($v);
         }
         return true;
@@ -55,7 +86,7 @@ class Blog extends Base
      * @method :post
      * @time   :2023/12/6 15:11
      */
-    public function saveHandleExtend(&$v,$news_id,$project_id){
+    public function saveHandleExtend(&$v,$blog_id,$project_id){
         unset($v['title']);
         if($v['type'] == 3){
             foreach ($v['values'] as $k1=>$v1){
@@ -71,7 +102,7 @@ class Blog extends Base
             $v['values'] = json_encode($v['values']);
         }
         $v['project_id'] = $project_id;
-        $v['news_id'] = $news_id;
+        $v['news_id'] = $blog_id;
         return $v;
     }
 }