From 5a576b6f0a9f038d335b4fbbefaf9d6513d0afe6 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Tue, 9 Jul 2024 16:16:46 +0800
Subject: [PATCH] =?UTF-8?q?fix=2086998=20=E4=BC=81=E4=B8=9A=E7=AB=AF--?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=89=E5=85=A8=E4=B8=AD=E5=BF=83--?=
 =?UTF-8?q?=E4=B8=80=E4=BA=8C=E4=B8=89=E7=BA=A7=E7=9A=84=E8=B5=84=E6=96=99?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../project/controller/PayCommonProjectController.java    | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
index 3e7caf31..9bda0d6f 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/controller/PayCommonProjectController.java
@@ -27,6 +27,9 @@ import com.jero.contract.service.IPayIncomeContractAssociatedService;
 import com.jero.contract.service.IPayIncomeContractService;
 import com.jero.drafting.entity.PayDraftingGroupSubItemContacts;
 import com.jero.drafting.service.IPayDraftingGroupSubItemContactsService;
+import com.jero.functionalsafetycenter.entity.SafetyCenterSubitem;
+import com.jero.functionalsafetycenter.service.SafetyCenterSubitemService;
+import com.jero.functionalsafetycenter.vo.SafetyCenterSubitemImport;
 import com.jero.mail.entity.PayMailBill;
 import com.jero.mail.entity.PayMailBillProject;
 import com.jero.mail.service.IPayMailBillProjectService;
@@ -118,6 +121,8 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 	private ITbMemberProjectService tbMemberProjectService;
 	@Resource
 	private ITbMemberProjectSubitemService tbMemberProjectSubitemService;
+	@Resource
+	private SafetyCenterSubitemService  safetyCenterSubitemService;
 	 /**
 	 * 分页列表查询
 	 *
@@ -562,8 +567,9 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 		 // 功能安全中心项目资料
 		 if(Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE9)){
 			 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+			 SafetyCenterSubitem safetyCenterSubitem = safetyCenterSubitemService.getById(id);
 			 LambdaQueryWrapper<PayWorkingGroupDistributionRecord> queryPayWorkingGroupDistributionRecord = new LambdaQueryWrapper<>();
-			 queryPayWorkingGroupDistributionRecord.eq(PayWorkingGroupDistributionRecord::getProjectId,id);
+			 queryPayWorkingGroupDistributionRecord.eq(PayWorkingGroupDistributionRecord::getProjectId,safetyCenterSubitem.getProjectId());
 			 queryPayWorkingGroupDistributionRecord.eq(PayWorkingGroupDistributionRecord::getContactsId,sysUser.getId());
 			 queryPayWorkingGroupDistributionRecord.groupBy(PayWorkingGroupDistributionRecord::getFileId);
 			 List<PayWorkingGroupDistributionRecord> listPayWorkingGroupDistributionRecord = payWorkingGroupDistributionRecordService.list(queryPayWorkingGroupDistributionRecord);