From 9718f87cfb97152019235fe289df9010185b6630 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 11 Nov 2021 11:48:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/NeighborHoodServiceImpl.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java index 8067c15d0d..d7558cd110 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java @@ -36,6 +36,7 @@ import org.springframework.util.StringUtils; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.util.*; +import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Function; import java.util.stream.Collectors; @@ -254,12 +255,16 @@ public class NeighborHoodServiceImpl implements NeighborHoodService { iterator.remove(); } //当前组织下网格名不存在的也不允许导入 + AtomicBoolean br = new AtomicBoolean(true); customerGridList.forEach(g->{ - if(!obj.getGridName().trim().equals(g.getGridName())){ - numList.add(obj.getRowNum()); - iterator.remove(); + if(obj.getGridName().trim().equals(g.getGridName())){ + br.set(false); } }); + if(br.get()){ + numList.add(obj.getRowNum()); + iterator.remove(); + } } //end sun