From 8977d0fbecfe90cf6b5fec8e7fcfa36e0011e8c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Fri, 17 Jun 2022 23:44:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E8=AE=A1=E7=AE=97=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=B1=87=E6=80=BB=E6=95=B0=E6=8D=AE=E5=8F=8A=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E6=B1=87=E6=80=BB=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xm/core/service/XmMenuService.java | 24 ++++++++----------- .../com/xm/core/service/XmTaskService.java | 24 ++++++++----------- 2 files changed, 20 insertions(+), 28 deletions(-) diff --git a/xm-core/src/main/java/com/xm/core/service/XmMenuService.java b/xm-core/src/main/java/com/xm/core/service/XmMenuService.java index b8126876..43d35dfc 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmMenuService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmMenuService.java @@ -370,24 +370,20 @@ public class XmMenuService extends BaseService { Set set=list.get(i); set.add(pidPathss[i]); } - if(list.size()<=0){ - return; - } - Set allSet=new HashSet<>(); - for (int i = list.size() - 1; i >= 0; i--) { - Set set=list.get(i); - if(set.size()>0){ - List ids=set.stream().filter(k->!allSet.contains(k)).collect(Collectors.toList()); - if(ids.size()>0){ - allSet.addAll(ids.stream().collect(Collectors.toSet())); - super.update("batchSumParents", ids); - } - + } + if(list.size()<=0){ + return; + } + for (int i = list.size() - 1; i >= 0; i--) { + Set set=list.get(i); + if(set.size()>0){ + List ids=set.stream().collect(Collectors.toList()); + if(ids.size()>0){ + super.update("batchSumParents", ids); } } - } } diff --git a/xm-core/src/main/java/com/xm/core/service/XmTaskService.java b/xm-core/src/main/java/com/xm/core/service/XmTaskService.java index a89bc399..e0cb21bc 100644 --- a/xm-core/src/main/java/com/xm/core/service/XmTaskService.java +++ b/xm-core/src/main/java/com/xm/core/service/XmTaskService.java @@ -604,26 +604,22 @@ public class XmTaskService extends BaseService { Set set=list.get(i); set.add(pidPathss[i]); } - if(list.size()<=0){ - return; - } - Set allSet=new HashSet<>(); - for (int i = list.size() - 1; i >= 0; i--) { - Set set=list.get(i); - if(set.size()>0){ - List ids=set.stream().filter(k->!allSet.contains(k)).collect(Collectors.toList()); - if(ids.size()>0){ - allSet.addAll(ids.stream().collect(Collectors.toSet())); - super.update("batchSumParents", ids); - } + } + if(list.size()<=0){ + return; + } + for (int i = list.size() - 1; i >= 0; i--) { + Set set=list.get(i); + if(set.size()>0){ + List ids=set.stream().collect(Collectors.toList()); + if(ids.size()>0){ + super.update("batchSumParents", ids); } } - } - }