From 3d57c612ad502f50c5cde1c2adfc8073dd5dca61 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 02:56:58 +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/XmMenuController.java | 12 ++++++++++-- .../com/xm/core/ctrl/XmProjectPhaseController.java | 6 +++++- .../main/java/com/xm/core/ctrl/XmTaskController.java | 3 ++- 3 files changed, 17 insertions(+), 4 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 c3e43913..6e2d206c 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 @@ -98,7 +98,11 @@ public class XmMenuController { String id= (String) map.get("menuId"); idSet.add(id); String pidPaths= (String) map.get("pidPaths"); - pidPathsSet.add(PubTool.getPidPaths(pidPaths,id)); + pidPaths=PubTool.getPidPaths(pidPaths,id); + if(pidPaths.length()<=2){ + continue; + } + 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()); @@ -143,7 +147,11 @@ public class XmMenuController { String id= (String) map.get("menuId"); idSet.add(id); String pidPaths= (String) map.get("pidPaths"); - pidPathsSet.add(PubTool.getPidPaths(pidPaths,id)); + pidPaths=PubTool.getPidPaths(pidPaths,id); + if(pidPaths.length()<=2){ + continue; + } + 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()); 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 cf62536f..7c2a756f 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 @@ -124,7 +124,11 @@ public class XmProjectPhaseController { String id= (String) map.get("id"); idSet.add(id); String pidPaths= (String) map.get("pidPaths"); - pidPathsSet.add(PubTool.getPidPaths(pidPaths,id)); + pidPaths=PubTool.getPidPaths(pidPaths,id); + if(pidPaths.length()<=2){ + continue; + } + 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()); 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 c53c2172..4bfaa3d0 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 @@ -149,10 +149,11 @@ public class XmTaskController { String id= (String) map.get("id"); idSet.add(id); String pidPaths= (String) map.get("pidPaths"); + pidPaths=PubTool.getPidPaths(pidPaths,id); if(pidPaths.length()<=2){ continue; } - pidPathsSet.add(PubTool.getPidPaths(pidPaths,id)); + 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());