From 1f96427c59857da7ce00cf8bc223400f55e457b8 Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Thu, 1 Aug 2019 16:31:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=B1=BB=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/service/GoodsService.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/service/GoodsService.php b/application/service/GoodsService.php
index dc20d3db0..4ee9d9b8b 100755
--- a/application/service/GoodsService.php
+++ b/application/service/GoodsService.php
@@ -186,6 +186,7 @@ class GoodsService
             foreach($goods_category as &$v)
             {
                 $category_ids = self::GoodsCategoryItemsIds([$v['id']], 1);
+                print_r($category_ids);
                 $goods = self::CategoryGoodsList(['where'=>['gci.category_id'=>$category_ids, 'g.is_home_recommended'=>1, 'g.is_shelves'=>1], 'm'=>0, 'n'=>8, 'field'=>'g.*']);
                 $v['goods'] = $goods['data'];
             }
@@ -216,9 +217,10 @@ class GoodsService
             $temp = self::GoodsCategoryItemsIds($data, $is_enable);
             if(!empty($temp))
             {
-                $data = array_merge($ids, $data, $temp);
+                $data = array_merge($data, $temp);
             }
         }
+        $data = empty($data) ? $ids : array_merge($ids, $data);
         return $data;
     }
 
-- 
GitLab