From 4fd249d79a66d4bde9379744663511cb9f450e61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Mon, 21 Feb 2022 09:50:28 +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 --- .../com/xm/core/ctrl/XmMenuController.java | 37 +++++++++++++------ .../core/ctrl/XmProjectPhaseController.java | 12 ++++-- .../com/xm/core/ctrl/XmTaskController.java | 25 +++++++++---- 3 files changed, 50 insertions(+), 24 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 6e2d206c..d21b8ca1 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 @@ -104,10 +104,15 @@ public class XmMenuController { } pidPathsSet.add(pidPaths); } - List> parentList=xmMenuService.selectListMapByWhere(map("pidPathsList",pidPathsSet.stream().collect(Collectors.toList()))); - parentList=parentList.stream().filter(i->!idSet.contains(i.get("menuId"))).collect(Collectors.toList()); - xmMenuList.addAll(parentList); - m.put("total", NumberUtil.getInteger(m.get("total"),0)+parentList.size()); + + if(pidPathsSet!=null && pidPathsSet.size()>0){ + List> parentList=xmMenuService.selectListMapByWhere(map("pidPathsList",pidPathsSet.stream().collect(Collectors.toList()))); + parentList=parentList.stream().filter(i->!idSet.contains(i.get("menuId"))).collect(Collectors.toList()); + if(parentList!=null && parentList.size()>0){ + xmMenuList.addAll(parentList); + m.put("total", NumberUtil.getInteger(m.get("total"),0)+parentList.size()); + } + } } m.put("data",xmMenuList); Tips tips=new Tips("查询成功"); @@ -153,10 +158,14 @@ public class XmMenuController { } pidPathsSet.add(pidPaths); } - List> parentList=xmMenuService.selectListMapByWhereWithState(map("pidPathsList",pidPathsSet.stream().collect(Collectors.toList()))); - parentList=parentList.stream().filter(i->!idSet.contains(i.get("menuId"))).collect(Collectors.toList()); - xmMenuList.addAll(parentList); - m.put("total", NumberUtil.getInteger(m.get("total"),0)+parentList.size()); + if(pidPathsSet!=null && pidPathsSet.size()>0){ + List> parentList=xmMenuService.selectListMapByWhereWithState(map("pidPathsList",pidPathsSet.stream().collect(Collectors.toList()))); + parentList=parentList.stream().filter(i->!idSet.contains(i.get("menuId"))).collect(Collectors.toList()); + if(parentList!=null && parentList.size()>0){ + xmMenuList.addAll(parentList); + m.put("total", NumberUtil.getInteger(m.get("total"),0)+parentList.size()); + } + } } m.put("data",xmMenuList); @@ -184,10 +193,14 @@ public class XmMenuController { String pidPaths= (String) map.get("pidPaths"); pidPathsSet.add(PubTool.getPidPaths(pidPaths,id)); } - List> parentList=xmMenuService.selectListMapByWhereWithPlan(map("projectId",xmMenu.get("projectId"),"pidPathsList",pidPathsSet.stream().collect(Collectors.toList()))); - parentList=parentList.stream().filter(i->!idSet.contains(i.get("menuId"))).collect(Collectors.toList()); - xmMenuList.addAll(parentList); - m.put("total", NumberUtil.getInteger(m.get("total"),0)+parentList.size()); + if(pidPathsSet!=null && pidPathsSet.size()>0){ + List> parentList=xmMenuService.selectListMapByWhereWithPlan(map("pidPathsList",pidPathsSet.stream().collect(Collectors.toList()))); + parentList=parentList.stream().filter(i->!idSet.contains(i.get("menuId"))).collect(Collectors.toList()); + if(parentList!=null && parentList.size()>0){ + xmMenuList.addAll(parentList); + m.put("total", NumberUtil.getInteger(m.get("total"),0)+parentList.size()); + } + } } m.put("data",xmMenuList); } 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 7c2a756f..e5471f02 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 @@ -130,10 +130,14 @@ public class XmProjectPhaseController { } pidPathsSet.add(pidPaths); } - List> parentList=xmProjectPhaseService.selectListMapByWhere(map("pidPathsList",pidPathsSet.stream().collect(Collectors.toList()))); - parentList=parentList.stream().filter(i->!idSet.contains(i.get("id"))).collect(Collectors.toList()); - xmProjectPhaseList.addAll(parentList); - m.put("total", NumberUtil.getInteger(m.get("total"),0)+parentList.size()); + if(pidPathsSet!=null && pidPathsSet.size()>0){ + List> parentList=xmProjectPhaseService.selectListMapByWhere(map("pidPathsList",pidPathsSet.stream().collect(Collectors.toList()))); + parentList=parentList.stream().filter(i->!idSet.contains(i.get("id"))).collect(Collectors.toList()); + if(parentList!=null && parentList.size()>0){ + xmProjectPhaseList.addAll(parentList); + m.put("total", NumberUtil.getInteger(m.get("total"),0)+parentList.size()); + } + } } m.put("data",xmProjectPhaseList); Tips tips=new Tips("查询成功"); 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 4bfaa3d0..a94ee6bc 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 @@ -155,10 +155,14 @@ public class XmTaskController { } pidPathsSet.add(pidPaths); } - List> parentList=xmTaskService.getTask(map("pidPathsList",pidPathsSet.stream().collect(Collectors.toList()))); - parentList=parentList.stream().filter(i->!idSet.contains(i.get("id"))).collect(Collectors.toList()); - xmTaskVoList.addAll(parentList); - m.put("total", NumberUtil.getInteger(m.get("total"),0)+parentList.size()); + if(pidPathsSet!=null && pidPathsSet.size()>0){ + List> parentList=xmTaskService.getTask(map("pidPathsList",pidPathsSet.stream().collect(Collectors.toList()))); + parentList=parentList.stream().filter(i->!idSet.contains(i.get("id"))).collect(Collectors.toList()); + if(parentList!=null && parentList.size()>0){ + xmTaskVoList.addAll(parentList); + m.put("total", NumberUtil.getInteger(m.get("total"),0)+parentList.size()); + } + } } m.put("data",xmTaskVoList); @@ -252,10 +256,15 @@ public class XmTaskController { } pidPathsSet.add(pidPaths); } - List> parentList=xmTaskService.getTask(map("pidPathsList",pidPathsSet.stream().collect(Collectors.toList()))); - parentList=parentList.stream().filter(i->!idSet.contains(i.get("id"))).collect(Collectors.toList()); - xmTaskVoList.addAll(parentList); - m.put("total", NumberUtil.getInteger(m.get("total"),0)+parentList.size()); + + if(pidPathsSet!=null && pidPathsSet.size()>0){ + List> parentList=xmTaskService.getTask(map("pidPathsList",pidPathsSet.stream().collect(Collectors.toList()))); + parentList=parentList.stream().filter(i->!idSet.contains(i.get("id"))).collect(Collectors.toList()); + if(parentList!=null && parentList.size()>0){ + xmTaskVoList.addAll(parentList); + m.put("total", NumberUtil.getInteger(m.get("total"),0)+parentList.size()); + } + } } }