From 228bb2dfb3217b7c3ef1e70f9e0f52cfb5bcbf49 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Thu, 30 Jun 2022 15:25:45 +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-=E8=8E=B7=E5=8F=96=E5=B0=8F=E5=8C=BA=E7=BC=96?=
 =?UTF-8?q?=E7=A0=81=E6=B7=BB=E5=8A=A0=E5=88=9D=E5=A7=8B=E5=8C=96=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=EF=BC=8C=E5=8A=A0=E9=95=BF=E8=A1=A8=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/IcOrganizationCodeInfoServiceImpl.java      | 12 ++++++++++--
 .../db/migration/V0.0.33__alter_ic_building.sql      |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.33__alter_ic_building.sql

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcOrganizationCodeInfoServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcOrganizationCodeInfoServiceImpl.java
index 80fce6a6a6..992cf837c4 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcOrganizationCodeInfoServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcOrganizationCodeInfoServiceImpl.java
@@ -121,7 +121,15 @@ public class IcOrganizationCodeInfoServiceImpl extends BaseServiceImpl<IcOrganiz
         //查询该社区下是否存在数据
         IcOrganizationCodeInfoEntity communEntity = baseDao.selectByCommunityIdAndCustomerId(customerId, communResult.getCommunityId());
         if (null == communEntity) {
-            String neighborCode = getCompleteAreaCode(communResult.getAreaCode()) + "001";
+            Integer neighborMaxNum = 1;
+            String neighborCode = getCompleteAreaCode(communResult.getAreaCode()) + getNewMaxIndex(3, neighborMaxNum);
+            //开发测试需要检测，因为包含行政编码为空的社区，会出现小区编码重复的情况
+            IcNeighborHoodEntity isHaveCoding = icNeighborHoodDao.selectByCoding(neighborCode,null);
+            while (null != isHaveCoding) {
+                neighborMaxNum++;
+                neighborCode = getCompleteAreaCode(communResult.getAreaCode()) + getNewMaxIndex(3, neighborMaxNum);
+                isHaveCoding = icNeighborHoodDao.selectByCoding(neighborCode,null);
+            }
 
             result.setCoding(neighborCode);
             result.setSysCoding(neighborCode);
@@ -129,7 +137,7 @@ public class IcOrganizationCodeInfoServiceImpl extends BaseServiceImpl<IcOrganiz
             IcOrganizationCodeInfoEntity newEntity = new IcOrganizationCodeInfoEntity();
             newEntity.setCustomerId(customerId);
             newEntity.setCommunityId(communResult.getCommunityId());
-            newEntity.setNeighborMaxNum("001");
+            newEntity.setNeighborMaxNum(getNewMaxIndex(3, neighborMaxNum));
             baseDao.insert(newEntity);
         } else {
             Integer neighborMaxNum = Integer.valueOf(communEntity.getNeighborMaxNum()) + 1;
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.33__alter_ic_building.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.33__alter_ic_building.sql
new file mode 100644
index 0000000000..a3a448ba14
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.33__alter_ic_building.sql
@@ -0,0 +1 @@
+alter table ic_building modify column `BUILDING_LEADER_NAME` varchar(32) DEFAULT NULL COMMENT '楼长姓名';