From c32f7e303b895dfff34b2fe9e5fa47c405f79339 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Mon, 5 Sep 2022 13:56:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E4=B8=80=E5=B0=8F=E5=8C=BA=E4=B8=8B?=
 =?UTF-8?q?=E6=A5=BC=E6=A0=8B=E4=B8=8D=E9=87=8D=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/model/ImportBuildingInfoListener.java    | 1 +
 .../src/main/java/com/epmet/model/ImportHouseInfoListener.java   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java
index 79009b1039..38f8e3b494 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java
@@ -215,6 +215,7 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
             // 说明数据库已存在此楼栋，不需添加
             nums.add(num);
             disposeErrorMsg(info,ImportErrorMsgConstants.BUILDING_NAME_EXITED_IN_GRID);
+            return;
         }
         if (orgType.equals(CustomerGridConstant.GRID) || orgType.equals(CustomerGridConstant.AGENCY)){
             List<String> gridIds = new ArrayList<>();
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java
index 194f39eb54..b8f1c41ce2 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java
@@ -494,6 +494,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
             // 说明数据库已存在此楼栋，不需添加
             nums.add(num);
             disposeErrorMsg(info, ImportErrorMsgConstants.BUILDING_NAME_EXITED_IN_GRID);
+            return;
         }
         if (orgType.equals(CustomerGridConstant.GRID) || orgType.equals(CustomerGridConstant.AGENCY)){
             List<String> gridIds = new ArrayList<>();