楼栋表，单元表有关联就不能删

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZAreaController.java

@@ -125,10 +125,10 @@ public class ZAreaController extends BaseController {
         if (i>0){
             return R.fail("小区已关联楼栋不能删除!");
         }
-        int j = civilService.getCivilByAreaId(Arrays.asList(ids));
-        if (j>0){
-            return R.fail("小区已关联民用工程不能删除!");
-        }
+//        int j = civilService.getCivilByAreaId(Arrays.asList(ids));
+//        if (j>0){
+//            return R.fail("小区已关联民用工程不能删除!");
+//        }
         int k = materialsResetsService.getMaterialByAreaId(Arrays.asList(ids));
         if (k>0){
             return R.fail("小区已关联用料统计不能删除!");

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZBuildingController.java

@@ -4,12 +4,14 @@ import java.util.List;
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
+import com.ruoyi.zdsz.service.IZUnitService;
 import lombok.RequiredArgsConstructor;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -41,6 +43,9 @@ public class ZBuildingController extends BaseController {
 
     private final IZBuildingService iZBuildingService;
 
+    @Autowired
+    private IZUnitService unitService;
+
     /**
      * 楼宇下拉
      *
@@ -113,6 +118,11 @@ public class ZBuildingController extends BaseController {
     @Log(title = "楼栋管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable String[] ids) {
+        //是否需要校验
+        int i = unitService.getListByUnitId(Arrays.asList(ids));
+        if (i>0){
+            return R.fail("楼栋已关联单元不能删除!");
+        }
         return toAjax(iZBuildingService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/zdsz/ZUnitController.java

@@ -4,12 +4,14 @@ import java.util.List;
 import java.util.Arrays;
 import java.util.concurrent.TimeUnit;
 
+import com.ruoyi.zdsz.service.IZHouseService;
 import lombok.RequiredArgsConstructor;
 
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.constraints.*;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import com.ruoyi.common.annotation.RepeatSubmit;
@@ -41,6 +43,8 @@ public class ZUnitController extends BaseController {
 
     private final IZUnitService iZUnitService;
 
+    @Autowired
+    private IZHouseService houseService;
     /**
      * 单元下拉
      *
@@ -113,6 +117,11 @@ public class ZUnitController extends BaseController {
     @Log(title = "单元管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable String[] ids) {
+        //是否需要校验
+        int i = houseService.getHouseByUnitId(Arrays.asList(ids));
+        if (i>0) {
+            return R.fail("单元已关联房间不能删除!");
+        }
         return toAjax(iZUnitService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZHouseService.java

@@ -46,4 +46,6 @@ public interface IZHouseService {
      * 校验并批量删除房间管理信息
      */
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
+
+    int getHouseByUnitId(Collection<String> list);
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/IZUnitService.java

@@ -53,4 +53,6 @@ public interface IZUnitService {
      * 校验并批量删除单元管理信息
      */
     Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
+
+    int getListByUnitId(Collection<String> list);
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZHouseServiceImpl.java

@@ -8,6 +8,7 @@ import com.ruoyi.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.zdsz.domain.ZBuilding;
 import com.ruoyi.zdsz.domain.bo.ZBuildingBo;
 import com.ruoyi.zdsz.domain.vo.ZBuildingVo;
 import lombok.RequiredArgsConstructor;
@@ -117,4 +118,11 @@ public class ZHouseServiceImpl implements IZHouseService {
         }
         return baseMapper.deleteBatchIds(ids) > 0;
     }
+
+    @Override
+    public int getHouseByUnitId(Collection<String> ids) {
+        LambdaQueryWrapper<ZHouse> lqw = Wrappers.lambdaQuery();
+        lqw.in(!ids.isEmpty(), ZHouse::getUnitId, ids);
+        return baseMapper.selectVoList(lqw).size();
+    }
 }

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZUnitServiceImpl.java

@@ -7,6 +7,7 @@ import com.ruoyi.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.zdsz.domain.ZHouse;
 import com.ruoyi.zdsz.domain.bo.ZBuildingBo;
 import com.ruoyi.zdsz.domain.vo.ZBuildingVo;
 import lombok.RequiredArgsConstructor;
@@ -115,4 +116,11 @@ public class ZUnitServiceImpl implements IZUnitService {
         }
         return baseMapper.deleteBatchIds(ids) > 0;
     }
+
+    @Override
+    public int getListByUnitId(Collection<String> ids) {
+        LambdaQueryWrapper<ZUnit> lqw = Wrappers.lambdaQuery();
+        lqw.in(!ids.isEmpty(), ZUnit::getBuildingId, ids);
+        return baseMapper.selectVoList(lqw).size();
+    }
 }