From 014c5195a52de8f08c9a67bc400c8f2bf823dd9b Mon Sep 17 00:00:00 2001
From: xucong <850806214@qq.com>
Date: Sun, 18 May 2025 21:55:20 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=8F=90=E4=BA=A4=E7=BC=BA=E5=A4=B1=E7=9A=84?=
 =?UTF-8?q?=E4=B8=9C=E8=A5=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/controller/GoodsController.php | 23 +-------------------
 app/adminapi/lists/GoodsLists.php           | 24 +++++++++++++++++++--
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/app/adminapi/controller/GoodsController.php b/app/adminapi/controller/GoodsController.php
index 74f6ae5..24c2a74 100644
--- a/app/adminapi/controller/GoodsController.php
+++ b/app/adminapi/controller/GoodsController.php
@@ -20,7 +20,6 @@ use app\adminapi\controller\BaseAdminController;
 use app\adminapi\lists\GoodsLists;
 use app\adminapi\logic\GoodsLogic;
 use app\adminapi\validate\GoodsValidate;
-use think\facade\Db;
 
 
 /**
@@ -40,29 +39,9 @@ class GoodsController extends BaseAdminController
      */
     public function lists()
     {
-        $goods_category_list = Db::name('goods_category')->where(['del'=>0])->column('name','id');
-        $result = $this->dataLists(new GoodsLists());
-        foreach($result['lists'] as $item){
-            $item['cat_name'] = self::getCateName($goods_category_list, $item);
-        }
-        return $result;
+        return $this->dataLists(new GoodsLists());
     }
-    public static function getCateName($cates, $item)
-    {
-        if(isset($cates[$item['third_category_id']])) {
-            return $cates[$item['third_category_id']];
-        }
 
-        if(isset($cates[$item['second_category_id']])) {
-            return $cates[$item['second_category_id']];
-        }
-
-        if(isset($cates[$item['first_category_id']])) {
-            return $cates[$item['first_category_id']];
-        }
-
-        return '';
-    }
 
     /**
      * @notes 添加
diff --git a/app/adminapi/lists/GoodsLists.php b/app/adminapi/lists/GoodsLists.php
index a57c6a0..eaa948c 100644
--- a/app/adminapi/lists/GoodsLists.php
+++ b/app/adminapi/lists/GoodsLists.php
@@ -18,7 +18,7 @@ namespace app\adminapi\lists;
 use app\adminapi\lists\BaseAdminDataLists;
 use app\common\model\Goods;
 use app\common\lists\ListsSearchInterface;
-
+use think\facade\Db;
 
 /**
  * Goods列表
@@ -54,7 +54,7 @@ class GoodsLists extends BaseAdminDataLists implements ListsSearchInterface
      */
     public function lists(): array
     {
-        return Goods::where($this->searchWhere)
+        $data = Goods::where($this->searchWhere)
             ->field(['id', 'name', 'code', 'first_category_id', 'second_category_id',
                 'third_category_id', 'brand_id', 'supplier_id', 'status', 'image',
                 'video', 'poster', 'remark', 'content', 'sort',
@@ -71,8 +71,28 @@ class GoodsLists extends BaseAdminDataLists implements ListsSearchInterface
             ->order(['id' => 'desc'])
             ->select()
             ->toArray();
+        $goods_category_list = Db::name('goods_category')->where(['del'=>0])->column('name','id');
+        foreach($data as $item){
+            $item['cat_name'] = self::getCateName($goods_category_list, $item);
+        }
+        return $data;
     }
+    public static function getCateName($cates, $item)
+    {
+        if(isset($cates[$item['third_category_id']])) {
+            return $cates[$item['third_category_id']];
+        }
 
+        if(isset($cates[$item['second_category_id']])) {
+            return $cates[$item['second_category_id']];
+        }
+
+        if(isset($cates[$item['first_category_id']])) {
+            return $cates[$item['first_category_id']];
+        }
+
+        return '';
+    }
 
     /**
      * @notes 获取数量