diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseInformationController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseInformationController.java
index 314940ecf8..21ca6fb933 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseInformationController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseInformationController.java
@@ -262,7 +262,7 @@ public class HouseInformationController {
     */
     @PostMapping("getNeighborHoodCoding/{gridId}")
     public Result<OrganizationCodeResultDTO> getNeighborHoodCoding(@LoginUser TokenDto tokenDTO, @PathVariable("gridId") String gridId) {
-        return icOrganizationCodeInfoService.getNeighborHoodCoding(tokenDTO.getCustomerId(),gridId);
+        return icOrganizationCodeInfoService.getNeighborHoodCoding(tokenDTO.getCustomerId(),gridId,false);
     }
 
     /**
@@ -274,7 +274,7 @@ public class HouseInformationController {
      */
     @PostMapping("getBuildingCoding/{neighborhoodId}")
     public Result<OrganizationCodeResultDTO> getBuildingCoding(@LoginUser TokenDto tokenDTO, @PathVariable("neighborhoodId") String neighborhoodId) {
-        return icOrganizationCodeInfoService.getBuildingCoding(tokenDTO.getCustomerId(),neighborhoodId);
+        return icOrganizationCodeInfoService.getBuildingCoding(tokenDTO.getCustomerId(),neighborhoodId,false);
     }
 
     /**
@@ -286,6 +286,6 @@ public class HouseInformationController {
      */
     @PostMapping("getHouseCoding/{unitId}")
     public Result<OrganizationCodeResultDTO> getHouseCoding(@LoginUser TokenDto tokenDTO, @PathVariable("unitId") String unitId) {
-        return icOrganizationCodeInfoService.getHouseCoding(tokenDTO.getCustomerId(),unitId);
+        return icOrganizationCodeInfoService.getHouseCoding(tokenDTO.getCustomerId(),unitId,false);
     }
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcOrganizationCodeInfoService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcOrganizationCodeInfoService.java
index c0e3bb5545..58791b1b44 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcOrganizationCodeInfoService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcOrganizationCodeInfoService.java
@@ -85,7 +85,7 @@ public interface IcOrganizationCodeInfoService extends BaseService<IcOrganizatio
      * @params [tokenDTO, gridId]
      * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.OrganizationCodeResultDTO>
      */
-    Result<OrganizationCodeResultDTO> getNeighborHoodCoding(String customerId, String gridId);
+    Result<OrganizationCodeResultDTO> getNeighborHoodCoding(String customerId, String gridId,Boolean updateFlag);
 
     /**
      * @describe: 【双实录入】获取楼栋编码
@@ -94,7 +94,7 @@ public interface IcOrganizationCodeInfoService extends BaseService<IcOrganizatio
      * @params [tokenDTO, neighborhoodId]
      * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.OrganizationCodeResultDTO>
      */
-    Result<OrganizationCodeResultDTO> getBuildingCoding(String customerId, String neighborhoodId);
+    Result<OrganizationCodeResultDTO> getBuildingCoding(String customerId, String neighborhoodId,Boolean updateFlag);
 
     /**
      * @describe: 【双实录入】获取单元编码
@@ -103,7 +103,7 @@ public interface IcOrganizationCodeInfoService extends BaseService<IcOrganizatio
      * @params [tokenDTO, neighborhoodId]
      * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.OrganizationCodeResultDTO>
      */
-    Result<OrganizationCodeResultDTO> getUnitCoding(String customerId, String buildingId);
+    Result<OrganizationCodeResultDTO> getUnitCoding(String customerId, String buildingId,Boolean updateFlag);
 
     /**
      * @describe: 【双实录入】获取房屋编码
@@ -112,5 +112,5 @@ public interface IcOrganizationCodeInfoService extends BaseService<IcOrganizatio
      * @params [tokenDTO, unitId]
      * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.OrganizationCodeResultDTO>
      */
-    Result<OrganizationCodeResultDTO> getHouseCoding(String customerId, String unitId);
+    Result<OrganizationCodeResultDTO> getHouseCoding(String customerId, String unitId,Boolean updateFlag);
 }
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 cdcb22272a..981e1f10b4 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
@@ -90,6 +90,10 @@ public class BuildingServiceImpl implements BuildingService {
     private ExecutorService executorService;
     @Autowired
     private IcOrganizationCodeInfoService icOrganizationCodeInfoService;
+    @Autowired
+    private IcOrganizationCodeInfoDao icOrganizationCodeInfoDao;
+    @Autowired
+    private IcOrganizationCodeInfoServiceImpl icOrganizationCodeInfoServiceImpl;
 
 
     @Override
@@ -106,6 +110,7 @@ public class BuildingServiceImpl implements BuildingService {
             if(null != isHaveCoding){
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "该楼栋编码已存在，请勿重复！","该楼栋编码已存在，请勿重复！");
             }
+            updateBuildingMaxNum(customerId,formDTO);
         }
         IcBuildingDTO icBuildingDTO = ConvertUtils.sourceToTarget(formDTO, IcBuildingDTO.class);
         icBuildingDTO.setCustomerId(customerId);
@@ -121,7 +126,7 @@ public class BuildingServiceImpl implements BuildingService {
             icBuildingUnit.setBuildingId(entity.getId());
             icBuildingUnit.setUnitName((i + 1) + "单元");
             icBuildingUnit.setUnitNum(String.valueOf(i + 1));
-            Result<OrganizationCodeResultDTO> codeResult = icOrganizationCodeInfoService.getUnitCoding(customerId,entity.getId());
+            Result<OrganizationCodeResultDTO> codeResult = icOrganizationCodeInfoService.getUnitCoding(customerId,entity.getId(),true);
             if(!codeResult.success() || null == codeResult.getData()){
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "生成单元编码异常，请联系管理员","生成单元编码异常，请联系管理员");
             }
@@ -133,6 +138,32 @@ public class BuildingServiceImpl implements BuildingService {
 
     }
 
+    /**
+    * @describe: 如果编码未改动提交，则最大数+1
+    * @author wangtong
+    * @date 2022/7/5 10:43
+    * @params [formDTO]
+    * @return void
+    */
+    private void updateBuildingMaxNum(String customerId,IcBulidingAddFormDTO formDTO){
+        //获取楼栋id、行政编码
+        OrganizationCommunityDTO communResult = icNeighborHoodDao.selectCommunityByNeiId(formDTO.getNeighborHoodId());
+        //如果是自增的，则最大数+1
+        IcOrganizationCodeInfoEntity communEntity = icOrganizationCodeInfoDao.selectByCommunityIdAndCustomerId(customerId, communResult.getCommunityId());
+        Integer buildMaxNum = org.apache.commons.lang3.StringUtils.isBlank(communEntity.getBuildingMaxNum())?1:Integer.valueOf(communEntity.getBuildingMaxNum()) + 1;
+        Integer submitMaxNum = null;
+        try {
+            submitMaxNum = Integer.valueOf(formDTO.getCoding().substring(formDTO.getCoding().length()-3));
+        }catch (Exception e){
+            e.printStackTrace();
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "编码转换失败", "编码转换失败");
+        }
+        if(buildMaxNum.intValue() == submitMaxNum.intValue()){
+            communEntity.setBuildingMaxNum(icOrganizationCodeInfoServiceImpl.getNewMaxIndex(3, buildMaxNum));
+            icOrganizationCodeInfoDao.updateBuildingByCuIdAndCoId(communEntity);
+        }
+    }
+
     @Override
     public List<BuildingTreeLevelDTO> treeList(String customerId, String staffId) {
         CustomerStaffInfoCacheResult agency = CustomerStaffRedis.getStaffInfo(customerId, staffId);
@@ -460,6 +491,7 @@ public class BuildingServiceImpl implements BuildingService {
             if(null != isHaveCoding){
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "该楼栋编码已存在，请勿重复！","该楼栋编码已存在，请勿重复！");
             }
+            updateBuildingMaxNum(customerId,formDTO);
         }
         IcBuildingDTO icBuildingDTO = ConvertUtils.sourceToTarget(formDTO, IcBuildingDTO.class);
         icBuildingDTO.setId(formDTO.getBuildingId());
@@ -502,7 +534,7 @@ public class BuildingServiceImpl implements BuildingService {
                     icBuildingUnit.setCustomerId(customerId);
                     icBuildingUnit.setUnitName(unitNum + "单元");
                     icBuildingUnit.setUnitNum(unitNum);
-                    Result<OrganizationCodeResultDTO> codeResult = icOrganizationCodeInfoService.getUnitCoding(customerId,icBuilding.getId());
+                    Result<OrganizationCodeResultDTO> codeResult = icOrganizationCodeInfoService.getUnitCoding(customerId,icBuilding.getId(),true);
                     if(!codeResult.success() || null == codeResult.getData()){
                         throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "生成单元编码异常，请联系管理员","生成单元编码异常，请联系管理员");
                     }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
index 127eef5f0e..78dd6ce923 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java
@@ -127,6 +127,12 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
     private OssFeignClient ossFeignClient;
     @Autowired
     private EpmetAdminOpenFeignClient epmetAdminOpenFeignClient;
+    @Autowired
+    private IcOrganizationCodeInfoDao icOrganizationCodeInfoDao;
+    @Autowired
+    private IcOrganizationCodeInfoServiceImpl icOrganizationCodeInfoServiceImpl;
+    @Autowired
+    private IcBuildingUnitDao icBuildingUnitDao;
 
 
     @Override
@@ -143,6 +149,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
             if(null != isHaveCoding){
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "该房屋编码已存在，请勿重复！","该房屋编码已存在，请勿重复！");
             }
+            updateHouseMaxNum(customerId,formDTO);
         }
         IcHouseEntity icHouseDTO = ConvertUtils.sourceToTarget(formDTO, IcHouseEntity.class);
         icHouseDTO.setCustomerId(customerId);
@@ -164,6 +171,32 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
         icHouseDao.updateById(entity);
     }
 
+    /**
+    * @describe: 如果编码未改动提交，则最大数+1
+    * @author wangtong
+    * @date 2022/7/5 10:53
+    * @params [customerId, formDTO]
+    * @return void
+    */
+    private void updateHouseMaxNum(String customerId, IcHouseAddFormDTO formDTO){
+        //获取社区id、单元编码
+        OrganizationCommunityDTO communResult = icBuildingUnitDao.selectCommunityByUnitId(formDTO.getBuildingUnitId());
+        //如果是自增的，则最大数+1
+        IcOrganizationCodeInfoEntity communEntity = icOrganizationCodeInfoDao.selectByCommunityIdAndCustomerId(customerId, communResult.getCommunityId());
+        Integer houseMaxNum = org.apache.commons.lang3.StringUtils.isBlank(communEntity.getHouseMaxNum())?1:Integer.valueOf(communEntity.getHouseMaxNum()) + 1;
+        Integer submitMaxNum = null;
+        try {
+            submitMaxNum = Integer.valueOf(formDTO.getCoding().substring(formDTO.getCoding().length()-4));
+        }catch (Exception e){
+            e.printStackTrace();
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "编码转换失败", "编码转换失败");
+        }
+        if(houseMaxNum.intValue() == submitMaxNum.intValue()){
+            communEntity.setHouseMaxNum(icOrganizationCodeInfoServiceImpl.getNewMaxIndex(4, houseMaxNum));
+            icOrganizationCodeInfoDao.updateHouseByCuIdAndCoId(communEntity);
+        }
+    }
+
     private String getHouseName(IcHouseAddFormDTO formDTO) {
         //设置房间名 楼栋-单元号-门牌号
         IcBuildingDTO icBuilding = icBuildingService.get(formDTO.getBuildingId());
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 992cf837c4..803a73cde8 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
@@ -108,7 +108,7 @@ public class IcOrganizationCodeInfoServiceImpl extends BaseServiceImpl<IcOrganiz
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Result<OrganizationCodeResultDTO> getNeighborHoodCoding(String customerId, String gridId) {
+    public Result<OrganizationCodeResultDTO> getNeighborHoodCoding(String customerId, String gridId,Boolean updateFlag) {
         if (StringUtils.isBlank(customerId) || StringUtils.isBlank(gridId)) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "所有字段不可为空", "所有字段不可为空");
         }
@@ -137,7 +137,9 @@ public class IcOrganizationCodeInfoServiceImpl extends BaseServiceImpl<IcOrganiz
             IcOrganizationCodeInfoEntity newEntity = new IcOrganizationCodeInfoEntity();
             newEntity.setCustomerId(customerId);
             newEntity.setCommunityId(communResult.getCommunityId());
-            newEntity.setNeighborMaxNum(getNewMaxIndex(3, neighborMaxNum));
+            if(updateFlag){
+                newEntity.setNeighborMaxNum(getNewMaxIndex(3, neighborMaxNum));
+            }
             baseDao.insert(newEntity);
         } else {
             Integer neighborMaxNum = Integer.valueOf(communEntity.getNeighborMaxNum()) + 1;
@@ -145,14 +147,18 @@ public class IcOrganizationCodeInfoServiceImpl extends BaseServiceImpl<IcOrganiz
             String neiCode = getCompleteAreaCode(communResult.getAreaCode()) + getNewMaxIndex(3, neighborMaxNum);
             IcNeighborHoodEntity isHaveCoding = icNeighborHoodDao.selectByCoding(neiCode,null);
             while (null != isHaveCoding) {
+                //先更新已有的最大值
+                communEntity.setNeighborMaxNum(getNewMaxIndex(3, neighborMaxNum));
+                baseDao.updateNeiByCuIdAndCoId(communEntity);
                 neighborMaxNum++;
                 neiCode = getCompleteAreaCode(communResult.getAreaCode()) + getNewMaxIndex(3, neighborMaxNum);
                 isHaveCoding = icNeighborHoodDao.selectByCoding(neiCode,null);
             }
             //更新该社区下最大的小区编号
-            communEntity.setNeighborMaxNum(getNewMaxIndex(3, neighborMaxNum));
-            baseDao.updateNeiByCuIdAndCoId(communEntity);
-
+            if(updateFlag) {
+                communEntity.setNeighborMaxNum(getNewMaxIndex(3, neighborMaxNum));
+                baseDao.updateNeiByCuIdAndCoId(communEntity);
+            }
             String neighborCode = getCompleteAreaCode(communResult.getAreaCode()) + getNewMaxIndex(3, neighborMaxNum);
             result.setCoding(neiCode);
             result.setSysCoding(neighborCode);
@@ -162,7 +168,7 @@ public class IcOrganizationCodeInfoServiceImpl extends BaseServiceImpl<IcOrganiz
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Result<OrganizationCodeResultDTO> getBuildingCoding(String customerId, String neighborhoodId) {
+    public Result<OrganizationCodeResultDTO> getBuildingCoding(String customerId, String neighborhoodId,Boolean updateFlag) {
         if (StringUtils.isBlank(customerId) || StringUtils.isBlank(neighborhoodId)) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "所有字段不可为空", "所有字段不可为空");
         }
@@ -175,7 +181,7 @@ public class IcOrganizationCodeInfoServiceImpl extends BaseServiceImpl<IcOrganiz
         }
         //如果小区编码为空,先生成小区编码并更新
         if (StringUtils.isBlank(neighborHood.getSysCoding())) {
-            OrganizationCodeResultDTO org = getNeighborHoodCoding(customerId, neighborHood.getGridId()).getData();
+            OrganizationCodeResultDTO org = getNeighborHoodCoding(customerId, neighborHood.getGridId(),true).getData();
             neighborHood.setCoding(org.getCoding());
             neighborHood.setSysCoding(org.getSysCoding());
             icNeighborHoodDao.updateById(neighborHood);
@@ -189,13 +195,16 @@ public class IcOrganizationCodeInfoServiceImpl extends BaseServiceImpl<IcOrganiz
             result.setCoding(communResult.getCoding() + "001");
             result.setSysCoding(communResult.getSysCoding() + "001");
             //补充该社区的楼栋最大数
-            buildingEntity.setBuildingMaxNum("001");
+//            buildingEntity.setBuildingMaxNum("001");
         } else {
             Integer buildingMaxNum = Integer.valueOf(buildingEntity.getBuildingMaxNum()) + 1;
             //验证可编辑的编码是否有重复
             String buildingCode = communResult.getCoding() + getNewMaxIndex(3, buildingMaxNum);
             IcBuildingEntity isHaveCoding = icBuildingDao.selectByCoding(buildingCode,null);
             while (null != isHaveCoding) {
+                //先更新已有的最大值
+                buildingEntity.setBuildingMaxNum(getNewMaxIndex(3, buildingMaxNum));
+                baseDao.updateBuildingByCuIdAndCoId(buildingEntity);
                 buildingMaxNum++;
                 buildingCode = communResult.getCoding() + getNewMaxIndex(3, buildingMaxNum);
                 isHaveCoding = icBuildingDao.selectByCoding(buildingCode,null);
@@ -204,15 +213,19 @@ public class IcOrganizationCodeInfoServiceImpl extends BaseServiceImpl<IcOrganiz
             result.setSysCoding(communResult.getSysCoding() + getNewMaxIndex(3, buildingMaxNum));
 
             //更新该社区下最大的楼栋编号
-            buildingEntity.setBuildingMaxNum(getNewMaxIndex(3, buildingMaxNum));
+            if(updateFlag) {
+                buildingEntity.setBuildingMaxNum(getNewMaxIndex(3, buildingMaxNum));
+            }
+        }
+        if(updateFlag) {
+            baseDao.updateBuildingByCuIdAndCoId(buildingEntity);
         }
-        baseDao.updateBuildingByCuIdAndCoId(buildingEntity);
         return new Result<OrganizationCodeResultDTO>().ok(result);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Result<OrganizationCodeResultDTO> getUnitCoding(String customerId, String buildingId) {
+    public Result<OrganizationCodeResultDTO> getUnitCoding(String customerId, String buildingId,Boolean updateFlag) {
         if (StringUtils.isBlank(customerId) || StringUtils.isBlank(buildingId)) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "所有字段不可为空", "所有字段不可为空");
         }
@@ -226,7 +239,7 @@ public class IcOrganizationCodeInfoServiceImpl extends BaseServiceImpl<IcOrganiz
         //如果楼栋编码为空,先生成楼栋编码并更新
         if (StringUtils.isBlank(buildingEntity.getSysCoding())) {
             ImportGeneralDTO neiInfo =  icBuildingDao.selectBuildingById(buildingId);
-            OrganizationCodeResultDTO org = getBuildingCoding(customerId, neiInfo.getNeighborHoodId()).getData();
+            OrganizationCodeResultDTO org = getBuildingCoding(customerId, neiInfo.getNeighborHoodId(),true).getData();
             buildingEntity.setCoding(org.getCoding());
             buildingEntity.setSysCoding(org.getSysCoding());
             icBuildingDao.updateById(buildingEntity);
@@ -255,7 +268,9 @@ public class IcOrganizationCodeInfoServiceImpl extends BaseServiceImpl<IcOrganiz
             result.setSysCoding(communResult.getSysCoding() + getNewMaxIndex(2, unitMaxNum));
 
             //更新该社区下最大的单元编号
-            unitEntity.setUnitMaxNum(getNewMaxIndex(2, unitMaxNum));
+            if(updateFlag) {
+                unitEntity.setUnitMaxNum(getNewMaxIndex(2, unitMaxNum));
+            }
         }
         baseDao.updateUnitByCuIdAndCoId(unitEntity);
         return new Result<OrganizationCodeResultDTO>().ok(result);
@@ -263,7 +278,7 @@ public class IcOrganizationCodeInfoServiceImpl extends BaseServiceImpl<IcOrganiz
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Result<OrganizationCodeResultDTO> getHouseCoding(String customerId, String unitId) {
+    public Result<OrganizationCodeResultDTO> getHouseCoding(String customerId, String unitId,Boolean updateFlag) {
         if (StringUtils.isBlank(customerId) || StringUtils.isBlank(unitId)) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "所有字段不可为空", "所有字段不可为空");
         }
@@ -277,7 +292,7 @@ public class IcOrganizationCodeInfoServiceImpl extends BaseServiceImpl<IcOrganiz
         //如果单元编码为空,先生成单元编码并更新
         if (StringUtils.isBlank(unitEntity.getSysCoding())) {
             HouseInfoResultDTO buildingInfo =  icBuildingUnitDao.getUnitDetail(unitId);
-            OrganizationCodeResultDTO org = getUnitCoding(customerId, buildingInfo.getBuildingId()).getData();
+            OrganizationCodeResultDTO org = getUnitCoding(customerId, buildingInfo.getBuildingId(),true).getData();
             unitEntity.setCoding(org.getCoding());
             unitEntity.setSysCoding(org.getSysCoding());
             icBuildingUnitDao.updateById(unitEntity);
@@ -289,14 +304,17 @@ public class IcOrganizationCodeInfoServiceImpl extends BaseServiceImpl<IcOrganiz
         IcOrganizationCodeInfoEntity houseEntity = baseDao.selectByCommunityIdAndCustomerId(customerId, communResult.getCommunityId());
         if (StringUtils.isBlank(houseEntity.getUnitMaxNum())) {
             result.setCoding(communResult.getCoding() + "001");
-            //补充该社区的单元最大数
-            houseEntity.setHouseMaxNum("001");
+            //补充该社区的房屋最大数
+//            houseEntity.setHouseMaxNum("001");
         } else {
             Integer houseMaxNum = Integer.valueOf(houseEntity.getUnitMaxNum()) + 1;
             //验证可编辑的编码是否有重复
             String houseCode = communResult.getCoding() + getNewMaxIndex(4, houseMaxNum);
             IcHouseEntity isHaveCoding = icHouseDao.selectByCoding(houseCode);
             while (null != isHaveCoding) {
+                //先更新已有的最大值
+                houseEntity.setHouseMaxNum(getNewMaxIndex(4, houseMaxNum));
+                baseDao.updateHouseByCuIdAndCoId(houseEntity);
                 houseMaxNum++;
                 houseCode = communResult.getCoding() + getNewMaxIndex(4, houseMaxNum);
                 isHaveCoding = icHouseDao.selectByCoding(houseCode);
@@ -304,9 +322,9 @@ public class IcOrganizationCodeInfoServiceImpl extends BaseServiceImpl<IcOrganiz
             result.setCoding(houseCode);
 
             //更新该社区下最大的房屋编号
-            houseEntity.setHouseMaxNum(getNewMaxIndex(4, houseMaxNum));
+//            houseEntity.setHouseMaxNum(getNewMaxIndex(4, houseMaxNum));
         }
-        baseDao.updateHouseByCuIdAndCoId(houseEntity);
+//        baseDao.updateHouseByCuIdAndCoId(houseEntity);
         return new Result<OrganizationCodeResultDTO>().ok(result);
     }
 
@@ -317,7 +335,7 @@ public class IcOrganizationCodeInfoServiceImpl extends BaseServiceImpl<IcOrganiz
      * @date 2022/6/29 10:30
      * @params [maxLength, maxIndex]
      */
-    private String getNewMaxIndex(Integer maxLength, Integer maxIndex) {
+    public String getNewMaxIndex(Integer maxLength, Integer maxIndex) {
         String result = maxIndex.toString();
         while (result.length() < maxLength) {
             result = "0" + result;
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 7639e0737f..57cc4646d7 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
@@ -11,8 +11,10 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.NeighborhoodConstant;
+import com.epmet.dao.CustomerGridDao;
 import com.epmet.dao.IcNeighborHoodDao;
 import com.epmet.dao.IcNeighborHoodPropertyDao;
+import com.epmet.dao.IcOrganizationCodeInfoDao;
 import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.IcNeighborHoodDTO;
 import com.epmet.dto.IcNeighborHoodPropertyDTO;
@@ -21,9 +23,11 @@ import com.epmet.dto.form.IcNeighborHoodAddFormDTO;
 import com.epmet.dto.form.IcNeighborHoodListFormDTO;
 import com.epmet.dto.form.IcUserBelongToChangedFormDTO;
 import com.epmet.dto.result.IcNeighborHoodResultDTO;
+import com.epmet.dto.result.OrganizationCommunityDTO;
 import com.epmet.entity.IcHouseEntity;
 import com.epmet.entity.IcNeighborHoodEntity;
 import com.epmet.entity.IcNeighborHoodPropertyEntity;
+import com.epmet.entity.IcOrganizationCodeInfoEntity;
 import com.epmet.excel.IcNeighborHoodExcel;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
@@ -62,6 +66,12 @@ public class NeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao,I
     private IcNeighborHoodDao icNeighborHoodDao;
     @Autowired
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+    @Autowired
+    private CustomerGridDao customerGridDao;
+    @Autowired
+    private IcOrganizationCodeInfoDao icOrganizationCodeInfoDao;
+    @Autowired
+    private IcOrganizationCodeInfoServiceImpl icOrganizationCodeInfoServiceImpl;
 
 
     @Override
@@ -79,12 +89,13 @@ public class NeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao,I
         if (!customerAgencyResult.success()) {
             throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
         }
-        //小区编码不可重复
+        //小区编码不可重复,自增最大数＋1
         if(org.apache.commons.lang3.StringUtils.isNotBlank(formDTO.getCoding())){
             IcNeighborHoodEntity isHaveCoding = icNeighborHoodDao.selectByCoding(formDTO.getCoding(),null);
             if(null != isHaveCoding){
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "该小区编码已存在，请勿重复！","该小区编码已存在，请勿重复！");
             }
+            updateNeiMaxNum(customerId,formDTO);
         }
         CustomerAgencyDTO customerAgencyDTO =  Optional.ofNullable(customerAgencyResult.getData()).orElse(new CustomerAgencyDTO());
         icNeighborHoodDTO.setParentAgencyId(customerAgencyDTO.getPid());
@@ -103,6 +114,35 @@ public class NeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao,I
         }
     }
 
+    /**
+    * @describe: 如果编码未改动提交，则最大数+1
+    * @author wangtong
+    * @date 2022/7/5 10:47
+    * @params [customerId, formDTO]
+    * @return void
+    */
+    private void updateNeiMaxNum(String customerId, IcNeighborHoodAddFormDTO formDTO){
+        //获取社区id、行政编码
+        OrganizationCommunityDTO communResult = customerGridDao.selectCommunityByGridId(formDTO.getGridId());
+        if (null == communResult || org.apache.commons.lang3.StringUtils.isBlank(communResult.getCommunityId())) {
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "未查到相关社区信息", "未查到相关社区信息");
+        }
+        //如果是自增的，则最大数+1
+        IcOrganizationCodeInfoEntity communEntity = icOrganizationCodeInfoDao.selectByCommunityIdAndCustomerId(customerId, communResult.getCommunityId());
+        Integer neighborMaxNum = org.apache.commons.lang3.StringUtils.isBlank(communEntity.getNeighborMaxNum())?1:Integer.valueOf(communEntity.getNeighborMaxNum()) + 1;
+        Integer submitMaxNum = null;
+        try {
+            submitMaxNum = Integer.valueOf(formDTO.getCoding().substring(formDTO.getCoding().length()-3));
+        }catch (Exception e){
+            e.printStackTrace();
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "编码转换失败", "编码转换失败");
+        }
+        if(neighborMaxNum.intValue() == submitMaxNum.intValue()){
+            communEntity.setNeighborMaxNum(icOrganizationCodeInfoServiceImpl.getNewMaxIndex(3, neighborMaxNum));
+            icOrganizationCodeInfoDao.updateNeiByCuIdAndCoId(communEntity);
+        }
+    }
+
     /**
      * 查询
      * @param formDTO
@@ -142,6 +182,7 @@ public class NeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao,I
             if(null != isHaveCoding){
                 throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "该小区编码已存在，请勿重复！","该小区编码已存在，请勿重复！");
             }
+            updateNeiMaxNum(customerId,formDTO);
         }
         IcNeighborHoodDTO icNeighborHoodDTO = ConvertUtils.sourceToTarget(formDTO, IcNeighborHoodDTO.class);
         icNeighborHoodDTO.setId(formDTO.getNeighborHoodId());