From 158faba7bad5c380bac1c51d1e36f32872f4b107 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:41:18 +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 --- .../src/main/java/com/xm/core/ctrl/XmTaskController.java | 9 ++++++++- .../main/java/com/xm/core/service/XmProjectService.java | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) 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 0f306fe3..c53c2172 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,6 +149,9 @@ public class XmTaskController { String id= (String) map.get("id"); idSet.add(id); String pidPaths= (String) map.get("pidPaths"); + if(pidPaths.length()<=2){ + continue; + } pidPathsSet.add(PubTool.getPidPaths(pidPaths,id)); } List> parentList=xmTaskService.getTask(map("pidPathsList",pidPathsSet.stream().collect(Collectors.toList()))); @@ -242,7 +245,11 @@ public class XmTaskController { 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()<=3){ + continue; + } + 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()); diff --git a/xm-core/src/main/java/com/xm/core/service/XmProjectService.java b/xm-core/src/main/java/com/xm/core/service/XmProjectService.java index c729b547..180e7522 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmProjectService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmProjectService.java @@ -134,7 +134,7 @@ public class XmProjectService extends BaseService { String newId=newTaskIdMap.get(oldId); node.setProjectId(xmProjectTo.getId()); node.setId(newId); - node.setParentTaskid(newIdMap.get(node.getParentTaskid())); + node.setParentTaskid(newTaskIdMap.get(node.getParentTaskid())); node.setCbranchId(user.getBranchId()); node.setCdeptid(user.getDeptid()); node.setCreateUsername(user.getUsername());