材质规格删除验证

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

@@ -110,6 +110,10 @@ public class ZEnginMaterialQualityController extends BaseController {
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable String[] ids) {
-        return toAjax(iZEnginMaterialQualityService.deleteWithValidByIds(Arrays.asList(ids), true));
+        Boolean b = iZEnginMaterialQualityService.deleteWithValidByIds(Arrays.asList(ids), true);
+        if (!b){
+            return R.fail("材质已绑定规格,不能删除");
+        }
+        return R.ok("删除成功");
     }
 }

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

@@ -1,13 +1,16 @@
 package com.ruoyi.zdsz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.core.page.TableDataInfo;
 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.ZEnginSpecifications;
 import com.ruoyi.zdsz.domain.ZEngineeringMaterialsResets;
+import com.ruoyi.zdsz.mapper.ZEnginSpecificationsMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.ruoyi.zdsz.domain.bo.ZEnginMaterialQualityBo;
@@ -16,6 +19,7 @@ import com.ruoyi.zdsz.domain.ZEnginMaterialQuality;
 import com.ruoyi.zdsz.mapper.ZEnginMaterialQualityMapper;
 import com.ruoyi.zdsz.service.IZEnginMaterialQualityService;
 
+import javax.annotation.Resource;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
@@ -29,7 +33,8 @@ import java.util.Collection;
 @RequiredArgsConstructor
 @Service
 public class ZEnginMaterialQualityServiceImpl implements IZEnginMaterialQualityService {
-
+    @Resource
+    private ZEnginSpecificationsMapper specificationsMapper;
     private final ZEnginMaterialQualityMapper baseMapper;
 
     /**
@@ -105,7 +110,13 @@ public class ZEnginMaterialQualityServiceImpl implements IZEnginMaterialQualityS
     @Override
     public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
         if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
+            if (!ObjectUtil.isEmpty(ids)) {
+                LambdaQueryWrapper<ZEnginSpecifications> lqw = Wrappers.lambdaQuery();
+                Long count = specificationsMapper.selectCount(lqw.in(ZEnginSpecifications::getMaterId, ids));
+                if (count>0){
+                    return false;
+                }
+            }
         }
         return baseMapper.deleteBatchIds(ids) > 0;
     }

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

@@ -148,9 +148,9 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         LambdaQueryWrapper<ZEngineeringCivil> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getDistrict()), ZEngineeringCivil::getDistrict, bo.getDistrict());
         lqw.eq(StringUtils.isNotBlank(bo.getAreaId()), ZEngineeringCivil::getAreaId, bo.getAreaId());
-        lqw.eq(ZEngineeringCivil::getBuildingId, bo.getBuildingId());
-        lqw.eq(ZEngineeringCivil::getUnitId, bo.getUnitId());
-        lqw.eq(ZEngineeringCivil::getHouseId, bo.getHouseId());
+        lqw.eq(StringUtils.isNotBlank(bo.getBuildingId()), ZEngineeringCivil::getBuildingId, bo.getBuildingId());
+        lqw.eq(StringUtils.isNotBlank(bo.getUnitId()), ZEngineeringCivil::getUnitId, bo.getUnitId());
+        lqw.eq(StringUtils.isNotBlank(bo.getHouseId()), ZEngineeringCivil::getHouseId, bo.getHouseId());
         lqw.orderByDesc(ZEngineeringCivil::getCreateTime);
         lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringCivil::getEnginType, bo.getEnginType());
         lqw.eq(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringCivil::getEnginClassification, bo.getEnginClassification());