审核bug修复

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

@@ -138,9 +138,9 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getAreaId()), ZEngineeringCivil::getAreaId, zEngineeringCivilBo.getAreaId());
         lqw.eq(ZEngineeringCivil::getBuildingId, zEngineeringCivilBo.getBuildingId());
 //        lqw.eq(ZEngineeringCivil::getUnitId, zEngineeringCivilBo.getUnitId());
-        lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getUnitId()),ZEngineeringCivil::getUnitId, zEngineeringCivilBo.getUnitId());
+        lqw.eq(ZEngineeringCivil::getUnitId, zEngineeringCivilBo.getUnitId());
 //            .isNull(!StringUtils.isNotBlank(zEngineeringCivilBo.getUnitId()),ZEngineeringCivil::getUnitId);
-        lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getHouseId()),ZEngineeringCivil::getHouseId, zEngineeringCivilBo.getHouseId());
+        lqw.eq(ZEngineeringCivil::getHouseId, zEngineeringCivilBo.getHouseId());
 //            .isNull(!StringUtils.isNotBlank(zEngineeringCivilBo.getHouseId()),ZEngineeringCivil::getHouseId);
         lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getEnginCycle()), ZEngineeringCivil::getEnginCycle, zEngineeringCivilBo.getEnginCycle());
         lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getEnginType()), ZEngineeringCivil::getEnginType, zEngineeringCivilBo.getEnginType());
@@ -240,9 +240,11 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
         LambdaQueryWrapper<ZEngineeringCivil> lqw = Wrappers.lambdaQuery();
         lqw.eq(StringUtils.isNotBlank(bo.getAreaId()), ZEngineeringCivil::getAreaId, bo.getAreaId());
         lqw.eq(ZEngineeringCivil::getBuildingId, bo.getBuildingId());
-        lqw.eq(StringUtils.isNotBlank(bo.getUnitId()),ZEngineeringCivil::getUnitId, bo.getUnitId())
-            .isNull(!StringUtils.isNotBlank(bo.getUnitId()),ZEngineeringCivil::getUnitId);
-        lqw.eq(StringUtils.isNotBlank(bo.getHouseId()), ZEngineeringCivil::getHouseId, bo.getHouseId()).isNull(!StringUtils.isNotBlank(bo.getHouseId()),ZEngineeringCivil::getHouseId);
+//        .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);
         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());