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 a32f8489fb..01c317f180 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
@@ -38,10 +38,7 @@ import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.model.BuildingInfoModel;
 import com.epmet.model.ImportBuildingInfoListener;
 import com.epmet.redis.IcHouseRedis;
-import com.epmet.service.BuildingService;
-import com.epmet.service.IcBuildingService;
-import com.epmet.service.IcBuildingUnitService;
-import com.epmet.service.IcNeighborHoodService;
+import com.epmet.service.*;
 import com.epmet.util.ExcelPoiUtils;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -91,6 +88,9 @@ public class BuildingServiceImpl implements BuildingService {
     private EpmetCommonServiceOpenFeignClient epmetCommonServiceOpenFeignClient;
     @Autowired
     private ExecutorService executorService;
+    @Autowired
+    private IcOrganizationCodeInfoService icOrganizationCodeInfoService;
+
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -121,6 +121,12 @@ 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());
+            if(!codeResult.success() || null == codeResult.getData()){
+                throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "生成单元编码异常，请联系管理员","生成单元编码异常，请联系管理员");
+            }
+            icBuildingUnit.setCoding(codeResult.getData().getCoding());
+            icBuildingUnit.setSysCoding(codeResult.getData().getSysCoding());
             unitList.add(icBuildingUnit);
         }
         icBuildingUnitService.insertBatch(unitList, NumConstant.ONE_HUNDRED);
@@ -495,6 +501,12 @@ public class BuildingServiceImpl implements BuildingService {
                     icBuildingUnit.setCustomerId(customerId);
                     icBuildingUnit.setUnitName(unitNum + "单元");
                     icBuildingUnit.setUnitNum(unitNum);
+                    Result<OrganizationCodeResultDTO> codeResult = icOrganizationCodeInfoService.getUnitCoding(customerId,icBuilding.getId());
+                    if(!codeResult.success() || null == codeResult.getData()){
+                        throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "生成单元编码异常，请联系管理员","生成单元编码异常，请联系管理员");
+                    }
+                    icBuildingUnit.setCoding(codeResult.getData().getCoding());
+                    icBuildingUnit.setSysCoding(codeResult.getData().getSysCoding());
                     unitList.add(icBuildingUnit);
                 }
             }