From fa46967111aab724684964fe2b77a3973c1d78a1 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Fri, 15 Apr 2022 17:04:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/controller/api/Goods.php | 2 +-
 app/data/model/ShopGoodsCate.php  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/data/controller/api/Goods.php b/app/data/controller/api/Goods.php
index a238aa2e0..42f3cc533 100644
--- a/app/data/controller/api/Goods.php
+++ b/app/data/controller/api/Goods.php
@@ -24,7 +24,7 @@ class Goods extends Controller
      */
     public function getCate()
     {
-        $this->success('获取分类成功', ShopGoodsCate::treeJson());
+        $this->success('获取分类成功', ShopGoodsCate::treeData());
     }
 
     /**
diff --git a/app/data/model/ShopGoodsCate.php b/app/data/model/ShopGoodsCate.php
index cdc632b17..9a47c9965 100644
--- a/app/data/model/ShopGoodsCate.php
+++ b/app/data/model/ShopGoodsCate.php
@@ -41,9 +41,9 @@ class ShopGoodsCate extends Model
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public static function treeJson(): array
+    public static function treeData(): array
     {
-        $query = static::mk()->where(['deleted' => 0, 'status' => 1])->order('sort desc,id desc');
+        $query = static::mk()->where(['status' => 1, 'deleted' => 0])->order('sort desc,id desc');
         return DataExtend::arr2tree($query->withoutField('sort,status,deleted,create_at')->select()->toArray());
     }
 
@@ -54,7 +54,7 @@ class ShopGoodsCate extends Model
      */
     public static function treeTable(bool $simple = false): array
     {
-        $query = static::mk()->where(['status' => 1])->order('sort desc,id asc');
+        $query = static::mk()->where(['status' => 1, 'deleted' => 0])->order('sort desc,id asc');
         $cates = array_column(DataExtend::arr2table($query->column('id,pid,name', 'id')), null, 'id');
         foreach ($cates as $cate) isset($cates[$cate['pid']]) && $cates[$cate['id']]['parent'] =& $cates[$cate['pid']];
         foreach ($cates as $key => $cate) {