gx

@@ -667,15 +667,20 @@ class BTemplateLogic extends BaseLogic
      * @method :any
      * @method :any
      * @time   :2023/7/17 16:03
      * @time   :2023/7/17 16:03
      */
      */
+    /**
+     * @remark :获取类型
+     * @name   :getModuleType
+     * @author :lyh
+     * @method :any
+     * @time   :2023/7/17 16:03
+     */
     public function getModuleType(): array
     public function getModuleType(): array
     {
     {
         //定义数据结构
         //定义数据结构
         $data = $this->model->product_type;
         $data = $this->model->product_type;
-        //产品，新闻，博客，一级分类数据
-        $map = ['pid'=>0, 'project_id'=>$this->user['project_id']];
-        $productCategory = Category::where($map)->get();
-        $newCategory = NewsCategory::where($map)->get();
-        $blogCategory = BlogCategory::where($map)->get();
+        $productCategory = $this->getCategoryList((new Category()),1);
+        $newCategory = $this->getCategoryList((new NewsCategory()));
+        $blogCategory = $this->getCategoryList((new BlogCategory()));
         if (!empty($productCategory)){
         if (!empty($productCategory)){
             foreach ($productCategory as $item){$data["products"]["category"][] =$item;}
             foreach ($productCategory as $item){$data["products"]["category"][] =$item;}
         }
         }
@@ -690,6 +695,26 @@ class BTemplateLogic extends BaseLogic
     }
     }
 
 
     /**
     /**
+     * @remark :获取1级+2级
+     * @name   :getCategoryList
+     * @author :lyh
+     * @method :post
+     * @time   :2023/12/20 10:26
+     */
+    public function getCategoryList($categoryModel,$status = 0){
+        $data = array();
+        $list = $categoryModel->list(['pid'=>0,'status'=>$status]);
+        foreach ($list as $v){
+            $data[] = $v;
+            $son_list = $categoryModel->list(['pid'=>$v['id'],'status'=>$status]);
+            foreach ($son_list as $v1){
+                $data[] = $v1;
+            }
+        }
+        return $this->success($data);
+    }
+
+    /**
      * @remark :保存html
      * @remark :保存html
      * @name   :savePublicTemplateHtml
      * @name   :savePublicTemplateHtml
      * @author :lyh
      * @author :lyh