From d8f39421d59fb9d4f29af813901a40eea3bbd5fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Wed, 29 Sep 2021 17:52:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E6=A0=87=E5=A7=94=E5=88=86=E5=8F=91?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...orkingGroupDistributionRecordServiceImpl.java | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java
index 5da2f2b5..9a0d3ffb 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/service/impl/PayWorkingGroupDistributionRecordServiceImpl.java
@@ -266,9 +266,11 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
             }
             msg = payWorkingGroup.getWorkingGroupProject();
         }else if(payWorkingGroupDistributionRecord.getProjectType() == PayProjectCommon.PROJECT_TYPE_FILE2){
-            LambdaQueryWrapper<PayWorkingGroupSubItem> queryPayWorkingGroupSubItem = new LambdaQueryWrapper<>();
-            queryPayWorkingGroupSubItem.in(PayWorkingGroupSubItem::getContactsTemporaryIdOne,Arrays.asList(s));
-            List<PayWorkingGroupSubItem> listPayWorkingGroupSubItem = payWorkingGroupSubItemService.list(queryPayWorkingGroupSubItem);
+            // 查询分标委成员
+            LambdaQueryWrapper<PayCaseCommitteeSubitem> queryPayCaseCommitteeSubitem = new LambdaQueryWrapper<>();
+            queryPayCaseCommitteeSubitem.eq(PayCaseCommitteeSubitem::getCommitteeId,payWorkingGroupDistributionRecord.getProjectId());
+            queryPayCaseCommitteeSubitem.in(PayCaseCommitteeSubitem::getContactsId,Arrays.asList(s));
+            List<PayCaseCommitteeSubitem> listPayCaseCommitteeSubitem = payCaseCommitteeSubitemService.list(queryPayCaseCommitteeSubitem);
             listPayWorkingGroupDataFile.forEach(p->{
                 OSSFile byId = iossFileService.getById(p.getFileId());
                 if(Objects.isNull(byId)){
@@ -278,16 +280,16 @@ public class PayWorkingGroupDistributionRecordServiceImpl extends ServiceImpl<Pa
                 String url = byId.getUrl();
                 listFile.add(path + url);
                 // 查询工作组成员
-                if(!CollectionUtils.isEmpty(listPayWorkingGroupSubItem)){
-                    listPayWorkingGroupSubItem.forEach(p1->{
+                if(!CollectionUtils.isEmpty(listPayCaseCommitteeSubitem)){
+                    listPayCaseCommitteeSubitem.forEach(p1->{
                         PayWorkingGroupDistributionRecord payWorkingGroupDistributionRecordNew = new PayWorkingGroupDistributionRecord();
                         payWorkingGroupDistributionRecordNew.setDataId(p.getId());
                         payWorkingGroupDistributionRecordNew.setProjectId(payWorkingGroupDistributionRecord.getProjectId());
                         payWorkingGroupDistributionRecordNew.setProjectType(payWorkingGroupDistributionRecord.getProjectType());
                         payWorkingGroupDistributionRecordNew.setFileId(byId.getId());
                         payWorkingGroupDistributionRecordNew.setSubId(p1.getId());
-                        payWorkingGroupDistributionRecordNew.setContactsId(p1.getContactsIdOne());
-                        payWorkingGroupDistributionRecordNew.setContactsName(p1.getContactsTemporaryNameOne());
+                        payWorkingGroupDistributionRecordNew.setContactsId(p1.getContactsId());
+                        payWorkingGroupDistributionRecordNew.setContactsName(p1.getContactsName());
                         listPayWorkingGroupDistributionRecord.add(payWorkingGroupDistributionRecordNew);
                     });
                 }