数据重复问题

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

@@ -136,18 +136,21 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
     public ZEngineeringCivilVo queryByEntityBo(ZEngineeringCivilBo zEngineeringCivilBo) {
         LambdaQueryWrapper<ZEngineeringCivil> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getAreaId()), ZEngineeringCivil::getAreaId, zEngineeringCivilBo.getAreaId());
-        if (StringUtils.isEmpty(zEngineeringCivilBo.getBuildingId()))
+        if (StringUtils.isEmpty(zEngineeringCivilBo.getBuildingId())) {
             lqw.isNull(ZEngineeringCivil::getBuildingId);
-        else
+        }else {
             lqw.eq(ZEngineeringCivil::getBuildingId, zEngineeringCivilBo.getBuildingId());
-        if (StringUtils.isEmpty(zEngineeringCivilBo.getUnitId()))
+        }
+        if (StringUtils.isEmpty(zEngineeringCivilBo.getUnitId())) {
             lqw.isNull(ZEngineeringCivil::getUnitId);
-        else
+        }else{
             lqw.eq(ZEngineeringCivil::getUnitId, zEngineeringCivilBo.getUnitId());
-        if (StringUtils.isEmpty(zEngineeringCivilBo.getHouseId()))
+        }
+        if (StringUtils.isEmpty(zEngineeringCivilBo.getHouseId())) {
             lqw.isNull(ZEngineeringCivil::getHouseId);
-        else
+        }else {
             lqw.eq(ZEngineeringCivil::getHouseId, zEngineeringCivilBo.getHouseId());
+        }
         lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getEnginCycle()), ZEngineeringCivil::getEnginCycle, zEngineeringCivilBo.getEnginCycle());
         lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getEnginType()), ZEngineeringCivil::getEnginType, zEngineeringCivilBo.getEnginType());
         lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getEnginClassification()), ZEngineeringCivil::getEnginClassification, zEngineeringCivilBo.getEnginClassification());
@@ -318,12 +321,21 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         validEntityBeforeSave(add);
         LambdaQueryWrapper<ZEngineeringCivil> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getAreaId()), ZEngineeringCivil::getAreaId, bo.getAreaId());
-        lqw.eq(ZEngineeringCivil::getBuildingId, bo.getBuildingId());
-//        .isNull(!StringUtils.isNotBlank(bo.getBuildingId()),ZEngineeringCivil::getBuildingId);
-        lqw.eq(ZEngineeringCivil::getUnitId, bo.getUnitId());
-//            .isNull(!StringUtils.isNotBlank(bo.getUnitId()),ZEngineeringCivil::getUnitId);
-        lqw.eq( ZEngineeringCivil::getHouseId, bo.getHouseId());
-//            .isNull(!StringUtils.isNotBlank(bo.getHouseId()),ZEngineeringCivil::getHouseId);
+        if (StringUtils.isEmpty(bo.getBuildingId())) {
+            lqw.isNull(ZEngineeringCivil::getBuildingId);
+        }else {
+            lqw.eq(ZEngineeringCivil::getBuildingId, bo.getBuildingId());
+        }
+        if (StringUtils.isEmpty(bo.getUnitId())) {
+            lqw.isNull(ZEngineeringCivil::getUnitId);
+        }else{
+            lqw.eq(ZEngineeringCivil::getUnitId, bo.getUnitId());
+        }
+        if (StringUtils.isEmpty(bo.getHouseId())) {
+            lqw.isNull(ZEngineeringCivil::getHouseId);
+        }else {
+            lqw.eq(ZEngineeringCivil::getHouseId, bo.getHouseId());
+        }
         lqw.eq(StringUtils.isNotBlank(bo.getEnginCycle()), ZEngineeringCivil::getEnginCycle, bo.getEnginCycle());
         lqw.eq(StringUtils.isNotBlank(bo.getEnginType()), ZEngineeringCivil::getEnginType, bo.getEnginType());
         lqw.eq(StringUtils.isNotBlank(bo.getEnginClassification()), ZEngineeringCivil::getEnginClassification, bo.getEnginClassification());