From c7cb907af068b3f777db7f3e2b28a42e37dd6955 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 28 May 2020 16:43:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A5=E5=BB=BA=E7=BE=A4?= =?UTF-8?q?=E7=9A=84ID=E5=92=8Cname?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../police/service/impl/PoliceServiceImpl.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/police/service/impl/PoliceServiceImpl.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/police/service/impl/PoliceServiceImpl.java index 9ce932c..597f80b 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/police/service/impl/PoliceServiceImpl.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/police/service/impl/PoliceServiceImpl.java @@ -55,10 +55,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; import static java.util.stream.Collectors.toList; @@ -231,7 +228,11 @@ public class PoliceServiceImpl extends BaseServiceImpl // 补建群 reduce.forEach(gridId -> { - createGroup(dto.getId(), dto.getDeptId(), dto.getDeptName()); + Optional gridOptional = gridList.stream().filter(item -> item.getDeptId().equals(gridId)).findFirst(); + if (gridOptional.isPresent()) { + DeptLevelAndLeaderDTO grid = gridOptional.get(); + createGroup(dto.getId(), grid.getDeptId(), grid.getDeptName()); + } }); }