gx

@@ -20,19 +20,38 @@ class BlogCategoryController extends BaseController
     public function lists(BlogCategoryModel $blogCategoryModel){
     public function lists(BlogCategoryModel $blogCategoryModel){
         //搜索条件
         //搜索条件
         $this->map['project_id'] = $this->user['project_id'];
         $this->map['project_id'] = $this->user['project_id'];
-        $lists = $blogCategoryModel->lists($this->map,$this->page,$this->row,$this->order,
-            ['id','pid','name','num','alias','status','sort','remark','created_at','updated_at']);
-        if(!empty($lists['list'])){
+        $filed = ['id','pid','name','num','alias','status','sort','remark','created_at','updated_at'];
+        $lists = $blogCategoryModel->list($this->map,$this->order,$filed);
+        $data = [];
+        if(!empty($lists)){
             $blogModel = new BlogModel();
             $blogModel = new BlogModel();
-            foreach ($lists['list'] as $k => $v){
+            foreach ($lists as $k => $v){
                 $v['num'] = $blogModel->formatQuery(['category_id'=>['like','%,' . $v['id'] . ',%']])->count();
                 $v['num'] = $blogModel->formatQuery(['category_id'=>['like','%,' . $v['id'] . ',%']])->count();
-                $v['alias'] = RouteMap::getRoute(RouteMap::SOURCE_BLOG_CATE, $v['id'], $this->user['project_id']);
                 $v['url'] = $this->user['domain'] . RouteMap::PATH_BLOG_CATE . '/' . $v['alias'];
                 $v['url'] = $this->user['domain'] . RouteMap::PATH_BLOG_CATE . '/' . $v['alias'];
-                $v['hasChildren'] =  (($blogCategoryModel->read(['pid'=>$v['id']])) != false) ? true : false;
-                $lists['list'][$k] = $v;
+                $lists[$k] = $v;
             }
             }
+            $data = $this->getListSon($lists);
         }
         }
-        $this->response('success',Code::SUCCESS,$lists);
+        $this->response('success',Code::SUCCESS,$data);
+    }
+
+    /**
+     * @remark :无分页子集处理
+     * @name   :getListSon
+     * @author :lyh
+     * @method :post
+     * @time   :2023/8/17 11:12
+     */
+    public function getListSon(&$list){
+        $data = array();
+        foreach ($list as $v){
+            $v = (array)$v;
+            if ($v['pid'] == 0) {
+                $v['sub'] = _get_child($v['id'], $list);
+                $data[]   = $v;
+            }
+        }
+        return $data;
     }
     }
 
 
     /**
     /**

@@ -79,10 +79,6 @@ class CategoryController extends BaseController
             $v = (array)$v;
             $v = (array)$v;
             if ($v['pid'] == 0) {
             if ($v['pid'] == 0) {
                 $v['sub'] = _get_child($v['id'], $list);
                 $v['sub'] = _get_child($v['id'], $list);
-//                foreach ($v['sub'] as $sub){
-//                    $v['product_num'] += $sub['product_num'];
-//                }
-
                 $data[]   = $v;
                 $data[]   = $v;
             }
             }
         }
         }