审核bug修复

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

@@ -134,18 +134,18 @@ public class ZAreaController extends BaseController {
     @DeleteMapping("/{ids}")
     public R remove(@NotEmpty(message = "主键不能为空") @PathVariable String[] ids) {
         //是否需要校验
-        int i = buildingService.getBuildingListByAreaId(Arrays.asList(ids));
-        if (i>0){
-            return R.fail("小区已关联楼栋不能删除!");
-        }
-//        int j = civilService.getCivilByAreaId(Arrays.asList(ids));
-//        if (j>0){
-//            return R.fail("小区已关联民用工程不能删除!");
+//        int i = buildingService.getBuildingListByAreaId(Arrays.asList(ids));
+//        if (i>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("小区已关联用料统计不能删除!");
 //        }
-        int k = materialsResetsService.getMaterialByAreaId(Arrays.asList(ids));
-        if (k>0){
-            return R.fail("小区已关联用料统计不能删除!");
-        }
         return toAjax(iZAreaService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
 

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

@@ -119,10 +119,10 @@ public class ZBuildingController extends BaseController {
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable String[] ids) {
         //是否需要校验
-        int i = unitService.getListByUnitId(Arrays.asList(ids));
-        if (i>0){
-            return R.fail("楼栋已关联单元不能删除!");
-        }
+//        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

@@ -118,10 +118,10 @@ public class ZUnitController extends BaseController {
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable String[] ids) {
         //是否需要校验
-        int i = houseService.getHouseByUnitId(Arrays.asList(ids));
-        if (i>0) {
-            return R.fail("单元已关联房间不能删除!");
-        }
+//        int i = houseService.getHouseByUnitId(Arrays.asList(ids));
+//        if (i>0) {
+//            return R.fail("单元已关联房间不能删除!");
+//        }
         return toAjax(iZUnitService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
 }