From 9ffdf5eb7cd96e8863dc523cd66deb8f3c0340ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Thu, 19 May 2022 15:53:38 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=AE=97=E5=8F=8A=E6=88=90=E6=9C=AC?= =?UTF-8?q?=E9=87=8D=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/xm/core/ctrl/XmMenuController.java | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) 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 63a4ae48..6005260b 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 @@ -456,7 +456,7 @@ public class XmMenuController { List hasChildMenus=new ArrayList<>(); List canDelList=new ArrayList<>(); List xmMenusDb=this.menuOperQxService.getUserCanOpMenusByIds(xmMenus.stream().map(i->i.getMenuId()).collect(Collectors.toList()),user.getUserid(),true); - if(xmMenusDb==null || xmMenusDb.size()>0){ + if(xmMenusDb==null || xmMenusDb.size()<=0){ return ResponseHelper.failed("data-0-or-no-qx","您不是产品级管理人员、需求负责人、上级需求负责人，无权限操作"); } for (XmMenu xmMenu : xmMenusDb) { @@ -467,22 +467,19 @@ public class XmMenuController { hasChildMenus.add(xmMenu.getMenuName()); } } - List canDelResult=new ArrayList<>(); - List noQxResult=xmMenus.stream().filter(i->!xmMenusDb.stream().filter(k->k.getMenuId().equals(i.getMenuId())).findAny().isPresent()).collect(Collectors.toList()); + List noQxResult=xmMenus.stream().filter(i->!xmMenusDb.stream().filter(k->k.getMenuId().equals(i.getMenuId())).findAny().isPresent()).collect(Collectors.toList()); if(canDelList.size()>0) { - if(canDelResult.size()>0){ - xmMenuService.doBatchDelete(canDelResult); - } + xmMenuService.doBatchDelete(canDelList); } List msg=new ArrayList<>(); - msg.add("成功删除"+canDelResult.size()+"个需求信息。"); + msg.add("成功删除"+canDelList.size()+"个需求信息。"); if(hasChildMenus.size()>0 ) { msg.add("以下"+hasChildMenus.size()+"个需求存在子需求，不允许删除,【"+StringUtils.arrayToDelimitedString(hasChildMenus.toArray(), ",")+"】."); } if(noQxResult.size()>0){ msg.add("无权限操作以下"+noQxResult.size()+"个需求,【"+noQxResult.stream().map(i->i.getMenuName()).collect(Collectors.joining(",")) +"】."); } - if(canDelResult.size()==0){ + if(canDelList.size()==0){ tips.setFailureMsg(msg.stream().collect(Collectors.joining(" "))); }else{ tips.setOkMsg(msg.stream().collect(Collectors.joining(" ")));