|
@@ -179,6 +179,12 @@ public class WorkInvoiceTwoController extends BaseController {
|
|
|
invoice.setWorkInvoiceProjectRelationList(workInvoiceService.getProjectRelation(invoice));
|
|
|
List<String> projectNameList = workInvoiceService.getProjectNameList(invoice);
|
|
|
String projectNameStr = String.join(",", projectNameList);
|
|
|
+ if(projectNameStr.contains("\r")){
|
|
|
+ projectNameStr = projectNameStr.replaceAll("\r"," ");
|
|
|
+ }
|
|
|
+ if(projectNameStr.contains("\n")){
|
|
|
+ projectNameStr = projectNameStr.replaceAll("\n"," ");
|
|
|
+ }
|
|
|
invoice.setProjectName(projectNameStr);
|
|
|
List<String> reportNumber = Lists.newArrayList();
|
|
|
for (WorkInvoiceProjectRelation info : invoice.getWorkInvoiceProjectRelationList()) {
|