From 4cdeab385df6f2fd38781b7425eacb0f309cf1b3 Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Sat, 20 Jan 2024 15:35:27 +0800
Subject: [PATCH] update

---
 .../lists/custom/CustomContactsLists.php         | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/adminapi/lists/custom/CustomContactsLists.php b/app/adminapi/lists/custom/CustomContactsLists.php
index 69aa2cafe..470358a82 100644
--- a/app/adminapi/lists/custom/CustomContactsLists.php
+++ b/app/adminapi/lists/custom/CustomContactsLists.php
@@ -58,7 +58,13 @@ class CustomContactsLists extends BaseAdminDataLists implements ListsSearchInter
      */
     public function lists(): array
     {
-        return CustomContacts::field('id,custom_id,name,position,phone,telephone,email,notes,annex')->where($this->searchWhere)
+	    $params = $this->request->get(['custom_name']);
+	    $where = [];
+	    if(isset($params['custom_name']) && $params['custom_name'] != ''){
+		    $custom_ids = Custom::where('name','like','%'.$params['custom_name'].'%')->column('id');
+		    $where[] = ['custom_id','in',$custom_ids];
+	    }
+        return CustomContacts::field('id,custom_id,name,position,phone,telephone,email,notes,annex')->where($this->searchWhere)->where($where)
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()->each(function($item){
@@ -82,7 +88,13 @@ class CustomContactsLists extends BaseAdminDataLists implements ListsSearchInter
      */
     public function count(): int
     {
-        return CustomContacts::where($this->searchWhere)->count();
+	    $params = $this->request->get(['custom_name']);
+	    $where = [];
+	    if(isset($params['custom_name']) && $params['custom_name'] != ''){
+		    $custom_ids = Custom::where('name','like','%'.$params['custom_name'].'%')->column('id');
+		    $where[] = ['custom_id','in',$custom_ids];
+	    }
+        return CustomContacts::where($this->searchWhere)->where($where)->count();
     }
 
 }
\ No newline at end of file