From 974822b65bc0728dca7b7fba7447264ad181e32b Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Sat, 12 Feb 2022 11:55:19 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=89=93=E5=8C=85=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=B8=AD=E5=B7=B2=E5=BC=80=E7=A5=A8=E9=87=91=E9=A2=9D=E4=B8=BA?=
 =?UTF-8?q?0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/pack/controller/PayPackCompanyController.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java
index af8fa356..3861d916 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/pack/controller/PayPackCompanyController.java
@@ -242,8 +242,13 @@ public class PayPackCompanyController extends JeroController<PayPackCompany, IPa
 		if(Objects.isNull(payPackCompany.getPackChargeTotal())){
 			payPackCompany.setPackChargeTotal(new BigDecimal("0.00"));
 		}
+
+		LambdaQueryWrapper<PayPackCompanyProject> packCompanyProjectLambdaQueryWrapper = new LambdaQueryWrapper<>();
+		packCompanyProjectLambdaQueryWrapper.eq(PayPackCompanyProject::getPackId,id);
+		List<PayPackCompanyProject> packCompanyProjectList = payPackCompanyProjectService.list(packCompanyProjectLambdaQueryWrapper);
+		List<String> projectIdList = packCompanyProjectList.stream().map(PayPackCompanyProject::getProjectId).collect(Collectors.toList());
 		LambdaQueryWrapper<PayMailBillProject> queryPayMailBillProject = new LambdaQueryWrapper<>();
-		queryPayMailBillProject.eq(PayMailBillProject::getBillId,id);
+		queryPayMailBillProject.in(PayMailBillProject::getProjectId,projectIdList);
 		List<PayMailBillProject> listPayMailBillProject = payMailBillProjectService.list(queryPayMailBillProject);
 		if(!CollectionUtils.isEmpty(listPayMailBillProject)){
 			BigDecimal d = listPayMailBillProject.stream().map(PayMailBillProject::getInvoiceAmount).reduce(BigDecimal.ZERO,BigDecimal::add);