From 81a6b17f809e87b026609b8fac2dd875fa35f2e9 Mon Sep 17 00:00:00 2001
From: "HESU\\HESU" <1696136552@qq.com>
Date: Mon, 21 Jul 2025 14:29:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E7=AD=9B=E9=80=89=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/crm/service/CustomerService.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/crm/service/CustomerService.php b/app/crm/service/CustomerService.php
index 51737b1..e411984 100644
--- a/app/crm/service/CustomerService.php
+++ b/app/crm/service/CustomerService.php
@@ -23,6 +23,7 @@ class CustomerService
         $recycle = $params['recycle'] ?? '';
         $follow = $params['follow'] ?? '';
         $follow_last = $params['follow_last'] ?? '';
+        $tagId = $params['tag_id'] ?? [];
         $where = [];
         $user_id =$params['user_id'];
         if(empty($user_id) || $user_id == 0){
@@ -58,9 +59,16 @@ class CustomerService
         $query = Customer::where($where);
 
         if(!empty($tagId)){
-            $query->whereHas('tags', function($query) use ($tagId){
-                $query->where('tag.id', $tagId);
-            });
+            //查询有$tagId 里任意一个标签的客户
+            //$query->whereHas('tags', function($query) use ($tagId){
+            //    $query->whereIn ('tag.id', $tagId);
+            //});
+            //查询有$tagId 里所有标签的客户
+            foreach ($tagId as $id) {
+                $query->whereHas('tags', function($query) use ($id){
+                    $query->where('tag.id', $id);
+                });
+            }
         }
         if (!Util::isEmpty($keyword)) {
             $query->where(function ($query) use ($keyword) {