From 123ea197fa381a5ac624fde721a4fd8952db8d1a Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Sat, 6 May 2023 10:42:36 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E5=B7=A5=E4=BD=9C=E7=BB=84=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=09=E6=89=8B=E6=9C=BA=E7=AB=AF=E7=9A=84=E8=81=94?=
 =?UTF-8?q?=E7=B3=BB=E4=BA=BA=E5=92=8C=E7=BD=91=E9=A1=B5=E7=AB=AF=E7=9A=84?=
 =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E4=B8=8D=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayCommonProjectController.java           | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 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 5f9e3c79..a389024a 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
@@ -41,8 +41,10 @@ import com.jero.project.common.PayProjectCommon;
 import com.jero.project.entity.PayCommonProject;
 import com.jero.project.entity.PayCompanyCommonProject;
 import com.jero.project.entity.PayWorkingGroupDistributionRecord;
+import com.jero.project.entity.PayWorkingGroupSubItemContacts;
 import com.jero.project.service.IPayCommonProjectService;
 import com.jero.project.service.IPayWorkingGroupDistributionRecordService;
+import com.jero.project.service.IPayWorkingGroupSubItemContactsService;
 import com.jero.project.vo.PayCommonProjectOutput;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -58,10 +60,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -101,6 +100,8 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 	private IPayWorkingGroupDistributionRecordService payWorkingGroupDistributionRecordService;
 	@Resource
 	private RolePermissionService rolePermissionService;
+	@Resource
+	private IPayWorkingGroupSubItemContactsService payWorkingGroupSubItemContactsService;
 	 /**
 	 * 分页列表查询
 	 *
@@ -471,6 +472,18 @@ public class PayCommonProjectController extends JeroController<PayCommonProject,
 				 });
 				 payCommonProject.setFiles(sb.toString());
 			 }
+			 LambdaQueryWrapper<PayWorkingGroupSubItemContacts> queryPayWorkingGroupSubItemContacts = new LambdaQueryWrapper<>();
+			 queryPayWorkingGroupSubItemContacts.eq(PayWorkingGroupSubItemContacts::getWorkingGroupSubId,id);
+			 List<PayWorkingGroupSubItemContacts> pwg = payWorkingGroupSubItemContactsService.list(queryPayWorkingGroupSubItemContacts);
+			 if(!CollectionUtils.isEmpty(pwg)){
+				 pwg.sort(Comparator.comparing(PayWorkingGroupSubItemContacts::getOrderNum));
+				 payCommonProject.setContactsTemporaryId(pwg.get(0).getContactsTemporaryId());
+				 payCommonProject.setContactsTemporaryName(pwg.get(0).getContactsTemporaryName());
+			 }else{
+				 payCommonProject.setContactsTemporaryId("");
+				 payCommonProject.setContactsTemporaryName("");
+			 }
+
 		 }
 		 String strProject = JSON.toJSONString(payCommonProject);
 		 payCompanyCommonProject = JSONObject.parseObject(strProject,PayCompanyCommonProject.class);