From 1366c8e0ac7ec29235e7fed62b323afbe1b08138 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 9 May 2022 09:27:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E5=AF=BC=E5=85=A5bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dao/IcNeighborHoodDao.java     | 2 ++
 .../com/epmet/model/ImportNeighborHoodInfoListener.java    | 2 +-
 .../com/epmet/service/impl/IcNeighborHoodServiceImpl.java  | 1 +
 .../src/main/resources/mapper/IcNeighborHoodDao.xml        | 7 +++++++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java
index 6238d0f303..8d1a4865de 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java
@@ -87,4 +87,6 @@ public interface IcNeighborHoodDao extends BaseDao<IcNeighborHoodEntity> {
      * @date 2022/4/28 09:10
      */
     void delProperty(@Param("neighborHoodIds")List<String> neighborHoodIds);
+
+    void updateOneNeighborHood(ImportGeneralDTO info);
 }
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 a2581e8c48..0f351c6b4d 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
@@ -109,7 +109,7 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
             disposeErrorMsg(info,"小区名称的值未填写");
             return;
         }
-        if(StringUtils.isBlank(data.getNeighborHoodName())){
+        if(StringUtils.isBlank(data.getAddress())){
             nums.add(num);
             disposeErrorMsg(info,"详细地址的值未填写");
             return;
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 196c445015..20dc6c5593 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
@@ -565,6 +565,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
         IcNeighborHoodEntity entity = baseDao.selectOne(wrapper);
         if (null != entity) {
             info.setNeighborHoodExistStatus(true);
+            baseDao.updateOneNeighborHood(info);
             return entity.getId();
         }
         entity = new IcNeighborHoodEntity();
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
index b8c3a2c51d..0f1cf1b84b 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml
@@ -67,6 +67,13 @@
         </foreach>
         )
     </update>
+    <update id="updateOneNeighborHood">
+        update ic_neighbor_hood
+        set ADDRESS = #{address},
+            REMARK = #{remark},
+            UPDATED_TIME = NOW()
+        where id = #{neighborHoodId}
+    </update>
 
     <!-- 删除物业关系 -->
     <delete id="delProperty">