From 9c3b72d5c84fbb14069a8cf0094aa95695cde1a2 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:46:10 +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 --- .../java/com/xm/core/ctrl/XmIterationMenuController.java | 8 ++++---- .../main/java/com/xm/core/ctrl/XmPhaseMenuController.java | 8 ++++---- .../main/java/com/xm/core/ctrl/XmProductController.java | 4 ++-- .../com/xm/core/ctrl/XmProjectGroupUserController.java | 8 ++++---- .../src/main/java/com/xm/core/ctrl/XmTaskController.java | 4 ++-- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationMenuController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationMenuController.java index c4ca6417..0e9eda60 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmIterationMenuController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmIterationMenuController.java @@ -155,9 +155,9 @@ public class XmIterationMenuController { msgs.add("有"+notJoins.size()+"个需求未加入迭代，无需移出。【"+notJoins.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】"); } if(canDels.size()==0){ - tips.setFailureMsg(msgs.stream().collect(Collectors.joining(";"))); + tips.setFailureMsg(msgs.stream().collect(Collectors.joining(" "))); }else { - tips.setOkMsg(msgs.stream().collect(Collectors.joining(";"))); + tips.setOkMsg(msgs.stream().collect(Collectors.joining(" "))); } }catch (BizException e) { tips=e.getTips(); @@ -227,9 +227,9 @@ public class XmIterationMenuController { msgs.add("有"+ntype1.size()+"个为需求集，不用加入迭代。【"+ntype1.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】"); } if(canAdds.size()==0){ - tips.setFailureMsg(msgs.stream().collect(Collectors.joining(";"))); + tips.setFailureMsg(msgs.stream().collect(Collectors.joining(" "))); }else { - tips.setOkMsg(msgs.stream().collect(Collectors.joining(";"))); + tips.setOkMsg(msgs.stream().collect(Collectors.joining(" "))); } }catch (BizException e) { diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmPhaseMenuController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmPhaseMenuController.java index 6e35c48c..549aaf35 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmPhaseMenuController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmPhaseMenuController.java @@ -152,9 +152,9 @@ public class XmPhaseMenuController { msgs.add("有"+notJoins.size()+"个需求未加入计划，无需移出，【"+notJoins.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】"); } if(canDels.size()==0){ - tips.setFailureMsg(msgs.stream().collect(Collectors.joining(";"))); + tips.setFailureMsg(msgs.stream().collect(Collectors.joining(" "))); }else { - tips.setOkMsg(msgs.stream().collect(Collectors.joining(";"))); + tips.setOkMsg(msgs.stream().collect(Collectors.joining(" "))); } }catch (BizException e) { tips=e.getTips(); @@ -229,9 +229,9 @@ public class XmPhaseMenuController { msgs.add("有"+ntype1.size()+"个需求为需求集，不用加入计划。【"+ntype1.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】"); } if(canAdds.size()==0){ - tips.setFailureMsg(msgs.stream().collect(Collectors.joining(";"))); + tips.setFailureMsg(msgs.stream().collect(Collectors.joining(" "))); }else { - tips.setOkMsg(msgs.stream().collect(Collectors.joining(";"))); + tips.setOkMsg(msgs.stream().collect(Collectors.joining(" "))); } }catch (BizException e) { diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java index 8a65c88f..fec85495 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProductController.java @@ -406,10 +406,10 @@ public class XmProductController { tips.setOkMsg(msg); }else{ if(errTips.size()>0 && canDelList.size()>0){ - String errmsg=errTips.stream().map(i->i.getMsg()).collect(Collectors.joining(";")); + String errmsg=errTips.stream().map(i->i.getMsg()).collect(Collectors.joining(" ")); tips.setOkMsg(msg+"\n"+errmsg); }else{ - tips.setFailureMsg(errTips.stream().map(i->i.getMsg()).collect(Collectors.joining(";"))); + tips.setFailureMsg(errTips.stream().map(i->i.getMsg()).collect(Collectors.joining(" "))); } } return tips; diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupUserController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupUserController.java index bee1c99a..29e7e34c 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupUserController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmProjectGroupUserController.java @@ -464,9 +464,9 @@ public class XmProjectGroupUserController { msg.add("以下"+noAddUsers.size()+"个小组用户无需新增。【"+noAddUsers.stream().collect(Collectors.toSet()).stream().collect(Collectors.joining(","))+"】"); } if(canAddUsers.size()!=0){ - tips.setOkMsg(msg.stream().collect(Collectors.joining(";"))); + tips.setOkMsg(msg.stream().collect(Collectors.joining(" "))); }else{ - tips.setFailureMsg(msg.stream().collect(Collectors.joining(";"))); + tips.setFailureMsg(msg.stream().collect(Collectors.joining(" "))); } groupUsersMap.forEach((groupId,groupUsers)->{ @@ -588,9 +588,9 @@ public class XmProjectGroupUserController { msg.add("以下"+noDelUsers.size()+"个小组用户无权限删除。【"+noDelUsers.stream().collect(Collectors.toSet()).stream().collect(Collectors.joining(","))+"】"); } if(canDelUsers.size()!=0){ - tips.setOkMsg(msg.stream().collect(Collectors.joining(";"))); + tips.setOkMsg(msg.stream().collect(Collectors.joining(" "))); }else{ - tips.setFailureMsg(msg.stream().collect(Collectors.joining(";"))); + tips.setFailureMsg(msg.stream().collect(Collectors.joining(" "))); } groupUsersMap.forEach((groupId,groupUsers)->{ diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java index c647041b..45c5c0b6 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmTaskController.java @@ -1053,9 +1053,9 @@ public class XmTaskController { msgs.add("以下"+existsExecuserList.size()+"个任务存在待结算的执行人，不能删除。【"+existsExecuserList.stream().map(i->i.getName()).collect(Collectors.joining(","))+"】"); } if(canDelNodes.size()==0){ - tips.setFailureMsg(msgs.stream().collect(Collectors.joining(";"))); + tips.setFailureMsg(msgs.stream().collect(Collectors.joining(" "))); }else{ - tips.setOkMsg(msgs.stream().collect(Collectors.joining(";"))); + tips.setOkMsg(msgs.stream().collect(Collectors.joining(" "))); } }catch (BizException e) {