From 2d88007ea659cfea4bd3e1e47841881927da7e70 Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Fri, 21 Mar 2025 18:26:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A5=97=E9=A4=90=E5=88=97=E8=A1=A8=E5=92=8C?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=B9=9F=20=E9=A1=B9=E7=9B=AE=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E6=98=BE=E7=A4=BA=E4=B8=8D=E4=B8=80=E8=87=B4=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Laravel/app/Http/Controllers/API/H5/ComboController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Laravel/app/Http/Controllers/API/H5/ComboController.php b/Laravel/app/Http/Controllers/API/H5/ComboController.php
index 33d25eb..46b0272 100644
--- a/Laravel/app/Http/Controllers/API/H5/ComboController.php
+++ b/Laravel/app/Http/Controllers/API/H5/ComboController.php
@@ -183,7 +183,7 @@ class ComboController extends Controller
 
 
     $combos = DB::select("select * from combos as a LEFT JOIN (
-select combo_id as c_id,count(*) as count from combo_items where status in(1) group by combo_id
+select combo_id as c_id,count(*) as count from combo_items where status in(1) and keshi_name<>'材料费' group by combo_id
 ) as b on a.combo_id=b.c_id  where a.status=1 " . $sql ."     ", $canshu);
 
     foreach ($combos as $key => $combo) {
@@ -198,7 +198,7 @@ select combo_id as c_id,count(*) as count from combo_items where status in(1) gr
       }
       $combo->tag = $tags;
       $combo->tag[] = [
-        'text' => $combo->item_count . '个项目',
+        'text' => $combo->count . '个项目',
         'text_color' => '#34C292',
         'color' => '#E9F8F3',
       ];