From f84d9c46574a2cd663105859035bc17891270923 Mon Sep 17 00:00:00 2001
From: wangpengfei <274878379@qq.com>
Date: 星期一, 14 八月 2023 10:41:54 +0800
Subject: [PATCH] Merge branch 'master' into fly

---
 service/contact.go |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/service/contact.go b/service/contact.go
index 25f898d..daab40e 100644
--- a/service/contact.go
+++ b/service/contact.go
@@ -102,9 +102,9 @@
 	return ecode.OK
 }
 
-func (ContactService) GetContactList(page, pageSize int, keyword string) ([]*model.ContactDetail, int64, int) {
+func (ContactService) GetContactList(page, pageSize int, data map[string]interface{}) ([]*model.ContactDetail, int64, int) {
 	// get contact list
-	contacts, total, err := model.NewContactSearch(nil).SetKeyword(keyword).SetPage(page, pageSize).FindAll()
+	contacts, total, err := model.NewContactSearch(nil).SetPage(page, pageSize).SetSearchMap(data).FindAll()
 	if err != nil {
 		return nil, 0, ecode.ContactListErr
 	}

--
Gitblit v1.8.0