diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java index e2840b93..fa03d042 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/controller/PayDraftingGroupSubItemController.java @@ -191,7 +191,18 @@ public class PayDraftingGroupSubItemController extends JeroController listSysUser = sysUserService.list(querySysUser); + // 获取企业联系人 + List subItemIds = list.stream().map(PayDraftingGroupSubItem::getId).collect(Collectors.toList()); + LambdaQueryWrapper queryDraftingGroupSubItemContacts = new LambdaQueryWrapper<>(); + queryDraftingGroupSubItemContacts.in(PayDraftingGroupSubItemContacts::getDraftingGroupSubId, subItemIds); + List payDraftingGroupSubItemContactsList = payDraftingGroupSubItemContactsService.list(queryDraftingGroupSubItemContacts); list.forEach(p->{ + if (!CollectionUtils.isEmpty(payDraftingGroupSubItemContactsList)) { + List payDraftingGroupSubItemContacts = payDraftingGroupSubItemContactsList + .stream().filter(item -> Objects.equals(item.getDraftingGroupSubId(), p.getId())).collect(Collectors.toList()); + p.setPayDraftingGroupSubItemContactsList(payDraftingGroupSubItemContacts); + } + List listPrincipalIdA = listPayDraftingGroup.stream().filter(item->Objects.equals(item.getId(),p.getDraftingGroupId())).collect(Collectors.toList()); if(!CollectionUtils.isEmpty(listPrincipalIdA)){ if(!CollectionUtils.isEmpty(listSysUser)){ diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java index edb0f73d..d4cbd7d0 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/drafting/service/impl/PayDraftingGroupSubItemServiceImpl.java @@ -179,7 +179,7 @@ public class PayDraftingGroupSubItemServiceImpl extends ServiceImpl