diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java index 52092e3b..c24c644e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupSubItemController.java @@ -171,19 +171,17 @@ public class PayWorkingGroupSubItemController extends JeroController listProjectIds = new ArrayList<>(); - // todo 关联企业联系人表 - // 工作组的企业联系人1,2,3 - LambdaQueryWrapper queryPayWorkingGroupSubItem = new LambdaQueryWrapper<>(); - queryPayWorkingGroupSubItem.eq(PayWorkingGroupSubItem::getContactsIdOne,sysUser.getId()).or() - .eq(PayWorkingGroupSubItem::getContactsIdTwo,sysUser.getId()).or() - .eq(PayWorkingGroupSubItem::getContactsIdThree,sysUser.getId()).or() - .eq(PayWorkingGroupSubItem::getMailContactsId,sysUser.getId()); - List listPayWorkingGroupSubItem = payWorkingGroupSubItemService.list(queryPayWorkingGroupSubItem); - if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItem)){ - List listProjectId = listPayWorkingGroupSubItem.stream().map(PayWorkingGroupSubItem::getId).collect(Collectors.toList()); + + // 工作组的企业联系人 + LambdaQueryWrapper queryPayWorkingGroupSubItemContacts = new LambdaQueryWrapper<>(); + queryPayWorkingGroupSubItemContacts.eq(PayWorkingGroupSubItemContacts::getContactsId,sysUser.getId()); + List listPayWorkingGroupSubItemContacts = payWorkingGroupSubItemContactsService.list(queryPayWorkingGroupSubItemContacts); + if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItemContacts)){ + List listProjectId = listPayWorkingGroupSubItemContacts.stream().map(PayWorkingGroupSubItemContacts::getWorkingGroupSubId).collect(Collectors.toList()); listProjectIds.addAll(listProjectId); } - // 邮寄联系人 + + // 邮寄联系人 LambdaQueryWrapper queryPayMailBill = new LambdaQueryWrapper<>(); queryPayMailBill.eq(PayMailBill::getContactId,sysUser.getId()); List listPayMailBill = payMailBillService.list(queryPayMailBill);