From e45caffac5961dab3a1bcae9cb9dad4fe4d6ee4a Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 28 Mar 2024 10:37:52 +0800
Subject: [PATCH] =?UTF-8?q?fix=2083132=20=E5=9C=A8=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E4=BC=81=E4=B8=9A=E7=AB=AF--=E9=A1=B9=E7=9B=AE=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=9D=A2-=E6=B2=A1=E6=9C=89=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE=E5=85=B6=E4=BB=96=E5=88=86=E5=8F=91=E8=B5=84=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/PayCommonProjectController.java   | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

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 7ca70ca7..ed503de4 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
@@ -542,16 +542,6 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 
 		 // 标协会员项目
 		 if(Objects.equals(String.valueOf(payCommonProject.getProjectType()), ProjectCommon.PROJECT_TYPE5)){
-			 LambdaQueryWrapper<TbMemberProjectFile> queryPayWorkingGroupDistributionRecord = new LambdaQueryWrapper<>();
-			 queryPayWorkingGroupDistributionRecord.eq(TbMemberProjectFile::getProjectId,id);
-			 List<TbMemberProjectFile> fileList = tbMemberProjectFileService.list(queryPayWorkingGroupDistributionRecord);
-			 String fileIds = fileList.stream().map(TbMemberProjectFile::getFileId).collect(Collectors.joining(","));
-			 payCommonProject.setFiles(fileIds);
-			 //payCommonProject.setChargeStandard(memberProject.getChargeStandard());
-			 //payCommonProject.setChargeNoticeFileId(memberProject.getChargeNoticeFileId());
-			 //payCommonProject.setCouncilChargeStandard(memberProject.getCouncilChargeStandard());
-			 //payCommonProject.setCouncilChargeNoticeNo(memberProject.getCouncilChargeNoticeNo());
-			 //payCommonProject.setCouncilChargeNoticeFileId(memberProject.getCouncilChargeNoticeFileId());
 			 TbMemberProjectSubitem tbMemberProjectSubitem = tbMemberProjectSubitemService.queryById(id);
 			 payCommonProject.setMemberNo(tbMemberProjectSubitem.getMemberNo());
 			 payCommonProject.setMemberNature(tbMemberProjectSubitem.getMemberNature());
@@ -561,6 +551,12 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 			 payCommonProject.setRemarks(tbMemberProjectSubitem.getRemark());
 			 payCommonProject.setChargeNoticeId(tbMemberProjectSubitem.getChargeNoticeId());
 
+			 LambdaQueryWrapper<TbMemberProjectFile> queryWrapper = new LambdaQueryWrapper<>();
+			 queryWrapper.eq(TbMemberProjectFile::getProjectId,tbMemberProjectSubitem.getProjectId());
+			 List<TbMemberProjectFile> fileList = tbMemberProjectFileService.list(queryWrapper);
+			 String fileIds = fileList.stream().map(TbMemberProjectFile::getFileId).collect(Collectors.joining(","));
+			 payCommonProject.setFiles(fileIds);
+
 		 }
 
 		 String strProject = JSON.toJSONString(payCommonProject);