From 779eabe9fa789ae90c7de4199a971204511bd323 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Fri, 1 Jul 2022 09:58:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=8C=E5=AE=9E=E4=BF=A1=E6=81=AF=E5=BD=95?=
 =?UTF-8?q?=E5=85=A5-=E5=B0=8F=E5=8C=BA=E6=A5=BC=E6=A0=8B=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=89=94=E9=99=A4=E7=B3=BB=E7=BB=9F=E7=BC=96=E7=A0=81?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/service/impl/BuildingServiceImpl.java    | 1 +
 .../java/com/epmet/service/impl/NeighborHoodServiceImpl.java     | 1 +
 2 files changed, 2 insertions(+)

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 01c317f180..cdcb22272a 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
@@ -454,6 +454,7 @@ public class BuildingServiceImpl implements BuildingService {
             }
         }
         //楼栋编码不可重复
+        formDTO.setSysCoding(null);
         if(org.apache.commons.lang3.StringUtils.isNotBlank(formDTO.getCoding())){
             IcBuildingEntity isHaveCoding = icBuildingDao.selectByCoding(formDTO.getCoding(),formDTO.getBuildingId());
             if(null != isHaveCoding){
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 2afbe5d76c..7639e0737f 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
@@ -136,6 +136,7 @@ public class NeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao,I
             throw new RenException(EpmetErrorCode.NEIGHBOOR_NAME_EXITED.getCode(), EpmetErrorCode.NEIGHBOOR_NAME_EXITED.getMsg());
         }
         //小区编码不可重复
+        formDTO.setSysCoding(null);
         if(org.apache.commons.lang3.StringUtils.isNotBlank(formDTO.getCoding())){
             IcNeighborHoodEntity isHaveCoding = icNeighborHoodDao.selectByCoding(formDTO.getCoding(),formDTO.getNeighborHoodId());
             if(null != isHaveCoding){