From 8869a226280299e51ace3b14304845c98415a303 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Fri, 26 Aug 2022 18:24:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E6=95=B4=E5=90=88=E5=AF=BC?= =?UTF-8?q?=E5=87=BA-=E5=88=A4=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/modules/report/util/WordUtil.java | 30 ++++++++++--------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java index 045a770e3..968f91b45 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/report/util/WordUtil.java @@ -369,21 +369,23 @@ public class WordUtil { String workProgressEn = lawsMonthlyReportWriteEO.getWorkProgressEn();//NIO工作进展英文 String lawsContactTemp = lawsMonthlyReportWriteEO.getLawsContact();//法规联系人 String lawsContact = getLawsContact(loginUserList, lawsContactTemp); - List lawsContactList = Arrays.asList(lawsContact.split(",")); - if (lawsContactList.size() > 4) { - StringBuilder str = new StringBuilder(); - int count = 0; - for (String s : lawsContactList) { - str.append(s + ","); - count++; - if (count % 4 == 0) { - str.append("\n"); + if(StringUtils.isNotEmpty(lawsContact)){ + List lawsContactList = Arrays.asList(lawsContact.split(",")); + if (lawsContactList.size() > 4) { + StringBuilder str = new StringBuilder(); + int count = 0; + for (String s : lawsContactList) { + str.append(s + ","); + count++; + if (count % 4 == 0) { + str.append("\n"); + } + } + if(str.toString().endsWith("\n")){ + lawsContact = str.substring(0,str.length()-2); + }else{ + lawsContact = str.substring(0,str.length()-1); } - } - if(str.toString().endsWith("\n")){ - lawsContact = str.substring(0,str.length()-2); - }else{ - lawsContact = str.substring(0,str.length()-1); } }