From eb5cc90e714c7dd327f70526778f83942b91f40c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Mon, 14 Mar 2022 17:03:44 +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 | 2 +- .../src/main/java/com/xm/core/ctrl/XmMenuController.java | 6 +++--- .../main/java/com/xm/core/ctrl/XmPhaseMenuController.java | 2 +- 3 files changed, 5 insertions(+), 5 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 27243dec..c96a04bd 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 @@ -219,7 +219,7 @@ public class XmIterationMenuController { msgs.add("有"+hadJoin.size()+"个需求已加入迭代，不能重复加入。【"+hadJoin.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】"); } if(ntype1.size()>0){ - msgs.add("有"+ntype1.size()+"个为需求集，不用加入迭代。【"+ntype1.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】"); + msgs.add("有"+ntype1.size()+"个为需求池，不用加入迭代。【"+ntype1.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】"); } if(canAdds.size()==0){ tips.setFailureMsg(msgs.stream().collect(Collectors.joining(" "))); diff --git a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java index 10d77b10..707e1e4d 100644 --- a/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java +++ b/xm-core/src/main/java/com/xm/core/ctrl/XmMenuController.java @@ -306,7 +306,7 @@ public class XmMenuController { }else { xmMenu=this.xmMenuService.selectOneObject(xmMenu); if(xmMenu.getChildrenCnt()!=null && xmMenu.getChildrenCnt()>0){ - return ResponseHelper.failed("hadChild","该需求集有子需求，不能删除"); + return ResponseHelper.failed("hadChild","该需求池有子需求，不能删除"); } if(!groupService.calcCanOpMenus(xmMenu)){ return ResponseHelper.failed("noqx","您无权删除此需求。"); @@ -354,7 +354,7 @@ public class XmMenuController { XmMenu xmMenuParentDb=this.xmMenuService.selectOneObject(new XmMenu(xmMenuDb.getPmenuId())); if(xmMenuParentDb!=null){ if(!"1".equals(xmMenuParentDb.getNtype())){ - ResponseHelper.failed("pmenu-ntype-0","上级需求"+xmMenuParentDb.getMenuName()+"不是需求集,不能下挂需求集"); + ResponseHelper.failed("pmenu-ntype-0","上级需求"+xmMenuParentDb.getMenuName()+"不是需求池,不能下挂需求池"); } } } @@ -533,7 +533,7 @@ public class XmMenuController { } XmMenu parentMenu=optional.get(); if(!"1".equals(parentMenu.getNtype())){ - return ResponseHelper.failed("parentMenu-ntype-not-1", "【"+parentMenu.getMenuName()+"】为需求，不能作为上级节点。请另选上级或者变更其为需求集节点"); + return ResponseHelper.failed("parentMenu-ntype-not-1", "【"+parentMenu.getMenuName()+"】为需求，不能作为上级节点。请另选上级或者变更其为需求池节点"); } Tips tips2=this.groupService.checkIsAdmOrTeamHeadOrAssByPtype(user,user.getUserid(),"1",parentMenu.getProductId(),null); if(!tips2.isOk()){ 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 35776cc6..5bb5b1fd 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 @@ -220,7 +220,7 @@ public class XmPhaseMenuController { msgs.add("有"+hadJoin.size()+"个需求已加入计划，不能重复加入。【"+hadJoin.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】"); } if(ntype1.size()>0){ - msgs.add("有"+ntype1.size()+"个需求为需求集，不用加入计划。【"+ntype1.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】"); + msgs.add("有"+ntype1.size()+"个需求为需求池，不用加入计划。【"+ntype1.stream().map(i->i.getMenuName()).collect(Collectors.joining(","))+"】"); } if(canAdds.size()==0){ tips.setFailureMsg(msgs.stream().collect(Collectors.joining(" ")));