From edad4c8c80feddeceb5430f930956ca2984a6730 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Sun, 25 Sep 2022 14:14:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=9C=88=E6=8A=A5--=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=B1=95=E7=A4=BA=E6=B3=95=E8=A7=84=E8=81=94=E7=B3=BB?=
 =?UTF-8?q?=E4=BA=BA(=E4=B8=AD=E8=8B=B1=E6=96=87=E5=88=87=E6=8D=A2)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/LawsMonthlyReportWriteEOServiceImpl.java      | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java
index 577b4050d..5eacaccbc 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/service/impl/LawsMonthlyReportWriteEOServiceImpl.java
@@ -344,7 +344,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 
 		for (LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO : pageInfo.getRecords()) {
 			//处理法规联系人
-			lawsContact(userList, lawsMonthlyReportWriteEO);
+			lawsContact(userList, lawsMonthlyReportWriteEO,lawsMonthlyReportWriteEOTemp.getCut());
 			//处理章节目录
 			if(StringUtils.isNotBlank(lawsMonthlyReportWriteEO.getMemoriesChapter())){
 				List<LawsMonthlyReportTitleTemplateEO> lawsMonthlyReportTitleTemplateEOS = lawsMonthlyReportTitleTemplateEOList.stream()
@@ -400,7 +400,7 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 		return pageInfo;
 	}
 
-	private void lawsContact(List<LoginUser> userList, LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO) {
+	private void lawsContact(List<LoginUser> userList, LawsMonthlyReportWriteEO lawsMonthlyReportWriteEO,String cut) {
 		String lawsContact = lawsMonthlyReportWriteEO.getLawsContact();
 		if(StringUtils.isNotBlank(lawsContact)){
 			List<LoginUser> collect = userList.stream().filter(e -> lawsContact.contains(e.getId())).collect(Collectors.toList());
@@ -408,7 +408,11 @@ public class LawsMonthlyReportWriteEOServiceImpl extends ServiceImpl<LawsMonthly
 			for (String s : lawsContact.split(",")) {
 				List<LoginUser> loginUserList = collect.stream().filter(e -> e.getId().equals(s)).collect(Collectors.toList());
 				if(loginUserList.size() != 0){
-					sb.append(loginUserList.get(0).getUsername()+",");
+					if(CutEnum.CN.getValue().equals(cut)){
+						sb.append(loginUserList.get(0).getRealname()+",");
+					}else{
+						sb.append(loginUserList.get(0).getUsername()+",");
+					}
 				}
 			}
 			if(StringUtils.isNotBlank(sb)){