From f1842bf9b5bb69b5078a215c02cb16b7e33f893a Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@123.com>
Date: 星期一, 08 一月 2024 14:38:46 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.5.5:10010/r/aps/crm

---
 api/v1/contract.go |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/api/v1/contract.go b/api/v1/contract.go
index 5cfdd31..a0228fc 100644
--- a/api/v1/contract.go
+++ b/api/v1/contract.go
@@ -161,15 +161,15 @@
 		return
 	}
 
+	if params.SearchMap == nil {
+		params.SearchMap = make(map[string]interface{}, 0)
+	}
 	userInfo := utils.GetUserInfo(c)
 	if userInfo.UserType == constvar.UserTypeSub {
-		if params.SearchMap == nil {
-			params.SearchMap = make(map[string]interface{}, 0)
-		}
 		params.SearchMap["member_ids"] = userInfo.SubUserIds
 	}
 
-	contracts, total, errCode := contractService.GetContractList(params.Page, params.PageSize, params.SearchMap)
+	contracts, total, errCode := contractService.GetContractList(params.Page, params.PageSize, params.SearchMap, params.Keyword)
 	if errCode != ecode.OK {
 		ctx.Fail(errCode)
 		return

--
Gitblit v1.8.0