dev合并下来

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java

@@ -553,29 +553,25 @@ public class BuildingServiceImpl implements BuildingService {
         if(nowUnit<unit){
             //如果小于，判断是否存在房屋，如果存在就提示不能更改
             throw new EpmetException(EpmetErrorCode.ORG_EDIT_FAILED.getCode(),EpmetErrorCode.ORG_EDIT_FAILED.getMsg(),"暂不支持单元号减小");
-        }
-        //新增单元
-        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{
-            //如果小于，判断是否存在房屋，如果存在就提示不能更改
-            throw new RenException(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);
 
+            }
         }
-
-
     }
 
     /**