From 9a2e8b31f8ce34fb21e19af26e2c6d88590e7ce9 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 15 Apr 2022 18:23:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=95=E5=85=83=E6=95=B0bu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BuildingServiceImpl.java     | 41 +++++++++----------
 1 file changed, 19 insertions(+), 22 deletions(-)

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 3511bfc536..58aa913cec 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
@@ -14,6 +14,7 @@ import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -536,30 +537,26 @@ public class BuildingServiceImpl implements BuildingService {
         //如果楼宇单元大于之前的楼宇单元，新增单元
         Integer nowUnit= formDTO.getTotalUnitNum();
         Integer unit = icBuilding.getTotalUnitNum();
-        if(nowUnit>=unit){
-            //新增单元
-            List<OptionResultDTO> units = icBuildingUnitService.getUnitOptions(icBuilding.getId());
-            Map<String, String> unitMap = units.stream().collect(Collectors.toMap(OptionResultDTO::getCode, OptionResultDTO::getLabel));
-            List<IcBuildingUnitEntity> unitList = new ArrayList<>();
-            for(int i = 1 ;i<nowUnit;i++){
-                String unitNum = String.valueOf(i);
-                if (!unitMap.containsKey(unitNum)) {
-                    IcBuildingUnitEntity icBuildingUnit = new IcBuildingUnitEntity();
-                    icBuildingUnit.setBuildingId(icBuilding.getId());
-                    icBuildingUnit.setCustomerId(customerId);
-                    icBuildingUnit.setUnitName(unitNum + "单元");
-                    icBuildingUnit.setUnitNum(unitNum);
-                    unitList.add(icBuildingUnit);
-                }
-            }
-            icBuildingUnitService.insertBatch(unitList);
-        }else{
+        if(nowUnit<unit){
             //如果小于，判断是否存在房屋，如果存在就提示不能更改
-            throw new RenException(EpmetErrorCode.ORG_EDIT_FAILED.getCode(),"楼宇单元下存在房屋，无法更新");
-
+            throw new EpmetException(EpmetErrorCode.ORG_EDIT_FAILED.getCode(),"暂不支持单元号减小");
         }
-
-
+        //新增单元
+        List<OptionResultDTO> units = icBuildingUnitService.getUnitOptions(icBuilding.getId());
+        Map<String, String> unitMap = units.stream().collect(Collectors.toMap(OptionResultDTO::getCode, OptionResultDTO::getLabel));
+        List<IcBuildingUnitEntity> unitList = new ArrayList<>();
+        for (int i = 1; i <= nowUnit; i++) {
+            String unitNum = String.valueOf(i);
+            if (!unitMap.containsKey(unitNum)) {
+                IcBuildingUnitEntity icBuildingUnit = new IcBuildingUnitEntity();
+                icBuildingUnit.setBuildingId(icBuilding.getId());
+                icBuildingUnit.setCustomerId(customerId);
+                icBuildingUnit.setUnitName(unitNum + "单元");
+                icBuildingUnit.setUnitNum(unitNum);
+                unitList.add(icBuildingUnit);
+            }
+        }
+        icBuildingUnitService.insertBatch(unitList);
     }
 
     /**