Merge branch 'feature/tagCustomer' into develop

2025-04-01 15:09:05 +08:00
parent 5b297966e5 47a7aa345a
commit 77e38a2883
1 changed files with 7 additions and 4 deletions
@@ -170,11 +170,14 @@ class CustomerController

        // 执行分页查询  //关联标签tags //关联标签及分组tags.group
        $query = Customer::with('tags')->where($where)
-            ->orderBy('id', 'desc');
+            ->orderBy('customer.id', 'desc');
        if(!empty($tagId)){
-            $query->with(['tags' => function($query) use ($tagId){
-                $query->where('id', $tagId);
-            }]);
+//            $query->with(['tags' => function($query) use ($tagId){
+//                $query->where('tag.id', $tagId);
+//            }]);
+            $query->whereHas('tags', function($query) use ($tagId){
+                $query->where('tag.id', $tagId);
+            });
        }
        if (!Util::isEmpty($keyword)) {
            $query->where(function ($query) use ($keyword) {