From 5b6ca622cecdde1b3a1b515b0b00725b9a4e9ae4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sun, 27 Feb 2022 21:50:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8A=82=E7=82=B9=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=81=E6=A0=87=E7=AD=BE=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xm/core/ctrl/XmProductPhaseController.java | 4 ++-- .../main/java/com/xm/core/ctrl/XmProjectPhaseController.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProductPhaseController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProductPhaseController.java index 8758de5e..0bad96b8 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProductPhaseController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProductPhaseController.java @@ -467,9 +467,9 @@ public class XmProductPhaseController { msgs.add("以下计划存在关联的任务，不允许删除。【"+existsTaskList.stream().collect(Collectors.joining(","))+"】"); } if(canDelNodes.size()==0){ - tips.setFailureMsg(msgs.stream().collect(Collectors.joining(";\n"))); + tips.setFailureMsg(msgs.stream().collect(Collectors.joining(" "))); }else{ - tips.setOkMsg(msgs.stream().collect(Collectors.joining(";\n"))); + tips.setOkMsg(msgs.stream().collect(Collectors.joining(" "))); } diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java index b180a32a..de36b485 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectPhaseController.java @@ -496,9 +496,9 @@ public class XmProjectPhaseController { msgs.add("以下计划存在关联的任务，不允许删除。【"+existsTaskList.stream().collect(Collectors.joining(","))+"】"); } if(canDelNodes.size()==0){ - tips.setFailureMsg(msgs.stream().collect(Collectors.joining(";\n"))); + tips.setFailureMsg(msgs.stream().collect(Collectors.joining(" "))); }else{ - tips.setOkMsg(msgs.stream().collect(Collectors.joining(";\n"))); + tips.setOkMsg(msgs.stream().collect(Collectors.joining(" "))); }