From 9f8de4fcec452bf04507588bd25fa5ff74de3018 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Fri, 29 Apr 2022 15:23:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayWorkingGroupSubItemController.java     | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

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<PayWorkingG
 			 return Result.error("没有查到用户信息！");
 		 }
 		 List<String> listProjectIds = new ArrayList<>();
-		 // todo 关联企业联系人表
-		 // 工作组的企业联系人1，2，3
-		 LambdaQueryWrapper<PayWorkingGroupSubItem> 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<PayWorkingGroupSubItem> listPayWorkingGroupSubItem = payWorkingGroupSubItemService.list(queryPayWorkingGroupSubItem);
-		 if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItem)){
-			 List<String> listProjectId = listPayWorkingGroupSubItem.stream().map(PayWorkingGroupSubItem::getId).collect(Collectors.toList());
+
+		 // 工作组的企业联系人
+		 LambdaQueryWrapper<PayWorkingGroupSubItemContacts> queryPayWorkingGroupSubItemContacts = new LambdaQueryWrapper<>();
+		 queryPayWorkingGroupSubItemContacts.eq(PayWorkingGroupSubItemContacts::getContactsId,sysUser.getId());
+		 List<PayWorkingGroupSubItemContacts> listPayWorkingGroupSubItemContacts = payWorkingGroupSubItemContactsService.list(queryPayWorkingGroupSubItemContacts);
+		 if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItemContacts)){
+		 	 List<String> listProjectId = listPayWorkingGroupSubItemContacts.stream().map(PayWorkingGroupSubItemContacts::getWorkingGroupSubId).collect(Collectors.toList());
 			 listProjectIds.addAll(listProjectId);
 		 }
-		// 邮寄联系人
+
+		 // 邮寄联系人
 		 LambdaQueryWrapper<PayMailBill> queryPayMailBill = new LambdaQueryWrapper<>();
 		 queryPayMailBill.eq(PayMailBill::getContactId,sysUser.getId());
 		 List<PayMailBill> listPayMailBill = payMailBillService.list(queryPayMailBill);