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 queryByCompanyMeeting(@RequestParam(name="companyId") String companyId) { + public Result queryByCompanyMeeting(@RequestParam(name="companyId", required = false) String companyId, + @RequestParam(name="memberId", required = false) String memberId) { LambdaQueryWrapper 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 list = payContactsManagementService.list(queryWrapper); if(!CollectionUtils.isEmpty(list)){ list.forEach(p->{