From 6fd398d04c475ce209322a85bb96ac88582f7b5d Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 5 Dec 2022 14:33:37 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=AF=B9=E5=A4=96=E5=BC=80=E6=94=BE?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../company/controller/PayContactsManagementController.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
index 03fc039f..ede52c61 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayContactsManagementController.java
@@ -731,9 +731,11 @@ public class PayContactsManagementController extends JeroController<PayContactsM
 	  */
 	 @ApiOperation(value="联系人管理-通过企业id查询用户-会议对外开放接口", notes="联系人管理-通过企业id查询用户-会议对外开放接口")
 	 @GetMapping(value = "/queryByCompanyMeeting")
-	 public Result<?> queryByCompanyMeeting(@RequestParam(name="companyId") String companyId) {
+	 public Result<?> queryByCompanyMeeting(@RequestParam(name="companyId", required = false) String companyId,
+											@RequestParam(name="memberId", required = false) String memberId) {
 		 LambdaQueryWrapper<PayContactsManagement> queryWrapper = new LambdaQueryWrapper<>();
-		 queryWrapper.eq(PayContactsManagement::getCompanyId,companyId);
+		 queryWrapper.eq(StringUtils.isNotBlank(companyId),PayContactsManagement::getCompanyId,companyId);
+		 queryWrapper.eq(StringUtils.isNotBlank(memberId),PayContactsManagement::getMemberId,memberId);
 		 List<PayContactsManagement> list = payContactsManagementService.list(queryWrapper);
 		 if(!CollectionUtils.isEmpty(list)){
 			 list.forEach(p->{