gx

@@ -9,6 +9,7 @@ use App\Http\Logic\Bside\Blog\BlogLabelLogic;
 use App\Http\Logic\Bside\Blog\BlogLogic;
 use App\Http\Requests\Bside\Blog\BlogRequest;
 use App\Models\Blog\Blog as BlogModel;
+use App\Models\Blog\BlogCategory;
 use App\Models\RouteMap\RouteMap;
 use App\Models\User\User;
 
@@ -24,13 +25,13 @@ class BlogController extends BaseController
      */
     public function lists(BlogModel $blogModel,BlogCategoryLogic $blogCategoryLogic,BlogLabelLogic $blogLabelLogic){
         $this->map = $this->searchParam();
-        $lists = $blogModel->lists($this->map,$this->page,$this->row,$this->order = 'sort',
-            ['id','category_id','operator_id','status','created_at','label_id','image','updated_at','name','sort','url']);
+        $lists = $blogModel->lists($this->map,$this->page,$this->row,$this->order = 'sort', ['id','category_id','operator_id','status','created_at','label_id','image','updated_at','name','sort','url']);
         if(!empty($lists) && !empty($lists['list'])){
+            //获取当前项目的所有分类
+            $data = $this->getCategoryList();
             $user = new User();
             foreach ($lists['list'] as $k => $v){
-                $v = $blogCategoryLogic->get_category_name($v);
-                $v = $blogLabelLogic->get_label_name($v);
+                $v['category_name'] = $this->categoryName($v['category_id'],$data);
                 $v['url'] = $this->user['domain'] .$v['url'];
                 $v['image_link'] = getImageUrl($v['image']);
                 $v['operator_name'] = $user->getName($v['operator_id']);
@@ -56,6 +57,46 @@ class BlogController extends BaseController
     }
 
     /**
+     * @remark :获取所有分类
+     * @name   :getCategoryList
+     * @author :lyh
+     * @method :post
+     * @time   :2023/9/14 13:56
+     */
+    public function getCategoryList(){
+        $categoryModel = new BlogCategory();
+        $data = [];
+        $cateList = $categoryModel->list(['project_id'=>$this->user['project_id']],['id','name']);
+        if(!empty($cateList)){
+            foreach ($cateList as $value){
+                $data[$value['id']] = $value['name'];
+            }
+        }
+        return $data;
+    }
+
+    /**
+     * @remark :获取分类名称
+     * @name   :categoryName
+     * @author :lyh
+     * @method :post
+     * @time   :2023/9/14 13:58
+     */
+    public function categoryName($category_id,$data){
+        $category_name = '';
+        if(!empty($category_id) && !empty($data)){
+            $arr = explode(',',trim($category_id,','));
+            foreach ($arr as $v){
+                if(isset($data[$v])){
+                    $category_name .= $data[$v].',';
+                }
+            }
+            $category_name = trim($category_name,',');
+        }
+        return $category_name;
+    }
+
+    /**
      * @remark :根据状态数量
      * @name   :getStatusNumber
      * @author :lyh