Merge remote-tracking branch 'origin/dev_ic_platform' into dev_ic_platform

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