From 430409b2967d9a20f1ea53eb9ca8c1b87496fb6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Tue, 19 Oct 2021 10:29:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#40905?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/contract/controller/PayIncomeContractController.java   | 2 +-
 .../com/jero/project/controller/PayWorkingGroupController.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java
index 3827ade0..bde0307d 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PayIncomeContractController.java
@@ -540,7 +540,7 @@ public class PayIncomeContractController extends JeroController<PayIncomeContrac
 		String selections = request.getParameter("selections");
 		if (oConvertUtils.isNotEmpty(selections)) {
 			List<String> selectionList = Arrays.asList(selections.split(","));
-			exportList = pageList.stream().filter(item -> selectionList.contains(payIncomeContract.getId())).collect(Collectors.toList());
+			exportList = pageList.stream().filter(item -> selectionList.contains(item.getId())).collect(Collectors.toList());
 		} else {
 			exportList = pageList;
 		}
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
index 5090498d..88c974db 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayWorkingGroupController.java
@@ -167,7 +167,7 @@ public class PayWorkingGroupController extends JeroController<PayWorkingGroup, I
 			// 查询打包年份的打包企业
 			List<String> listProject = new ArrayList<>();
 			if(Objects.equals(payIncomeContract.getPack(),PayProjectCommon.PACKAGING1)){
-				listProject = payPackCompanyProjectService.queryPackToYear(payIncomeContract.getSignedCompanyId(),PayProjectCommon.PROJECT_TYPE1,payIncomeContract.getPackYear());
+				listProject = payPackCompanyProjectService.queryPackToYear(payIncomeContract.getSignedCompanyId(),PayProjectCommon.PROJECT_TYPE2,payIncomeContract.getPackYear());
 			}
 			List<String> finalListProject = listProject;
 			list.forEach(p->{