From 2dc95d6b38be2bddcc8228d597dec263f3523ee5 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 18 Feb 2022 09:20:40 +0800
Subject: [PATCH 1/2] bug

---
 .../java/com/epmet/model/ImportBuildingInfoListener.java   | 4 +---
 .../main/java/com/epmet/model/ImportHouseInfoListener.java | 7 +++----
 .../com/epmet/model/ImportNeighborHoodInfoListener.java    | 4 +---
 3 files changed, 5 insertions(+), 10 deletions(-)

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 594b64e672..3abe78b418 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
@@ -103,9 +103,7 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
                     if (k.equals(r.getAgencyName() + "_" + r.getGridName() + "_" +
                             r.getNeighborHoodName() + "_" + r.getBuildingName())){
                         // 集合里重复的
-                        if (r.getExistStatus()){
-                            nums.add(r.getNum());
-                        }
+                        nums.add(r.getNum());
                         r.setExistStatus(true);
                     }
                 }
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 bcac2e5a4b..6025b15a6f 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
@@ -133,8 +133,9 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
                     if (k.equals(r.getBuildingUnitId()+"_"+r.getDoorName())){
                         // 集合里重复的
                         if (r.getExistStatus()){
-                            nums.add(r.getNum());
+
                         }
+                        nums.add(r.getNum());
                         r.setExistStatus(true);
                     }
                 }
@@ -147,9 +148,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
             for (ImportGeneralDTO n : needInsertList) {
                 if ((n.getBuildingUnitId()+"_"+n.getDoorName()).equals(e)){
                     // 库里存在的
-                    if (n.getExistStatus()){
-                        nums.add(n.getNum());
-                    }
+                    nums.add(n.getNum());
                     n.setExistStatus(true);
                 }
             }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java
index e2c46688e5..c31e83960b 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java
@@ -96,9 +96,7 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
                 for (ImportGeneralDTO r : needDisposeList) {
                     if (k.equals(r.getAgencyName() + "_" + r.getGridName() + "_" + r.getNeighborHoodName())){
                         // 集合里重复的
-                        if (r.getExistStatus()){
-                            nums.add(r.getNum());
-                        }
+                        nums.add(r.getNum());
                         r.setExistStatus(true);
                     }
                 }

From 1aec70b44c8d98aeb534f465e8130937f7dd6e35 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Fri, 18 Feb 2022 09:25:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/controller/HouseController.java     | 2 +-
 .../main/java/com/epmet/service/impl/BuildingServiceImpl.java   | 2 +-
 .../java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
index c0c54f8540..017da95fd9 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
@@ -289,7 +289,7 @@ public class HouseController implements ResultDataResolver {
             s = s + "第"+nums.stream().map(String::valueOf).collect(Collectors.joining("、"))+"条导入失败";
             return new Result<>().error(9999,String.format(s,num,num - nums.size()));
         }
-        return new Result<>().ok(String.format(s,num,num));
+        return new Result<>().error(9999,String.format(s,num,num));
     }
 
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
index a518215b5c..15daabf246 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
@@ -429,7 +429,7 @@ public class BuildingServiceImpl implements BuildingService {
             s = s + "第"+nums.stream().map(String::valueOf).collect(Collectors.joining("、"))+"条导入失败";
             return new Result<>().error(9999,String.format(s,num,num - nums.size()));
         }
-        return new Result<>().ok(String.format(s,num,num));
+        return new Result<>().error(9999,String.format(s,num,num));
     }
 
     private List<IcBuildingExcel> searchAllBuilding(ListIcNeighborHoodFormDTO formDTO) {
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
index dddb2126e0..99db449d72 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
@@ -419,7 +419,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
             s = s + "第"+nums.stream().map(String::valueOf).collect(Collectors.joining("、"))+"条导入失败";
             return new Result<>().error(9999,String.format(s,num,num - nums.size()));
         }
-        return new Result<>().ok(String.format(s,num,num));
+        return new Result<>().error(9999,String.format(s,num,num));
     }
 
     /**