提交代码

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

@@ -138,10 +138,10 @@ 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())
-            .isNull(!StringUtils.isNotBlank(zEngineeringCivilBo.getUnitId()),ZEngineeringCivil::getUnitId);
-        lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getHouseId()),ZEngineeringCivil::getHouseId, zEngineeringCivilBo.getHouseId())
-            .isNull(!StringUtils.isNotBlank(zEngineeringCivilBo.getHouseId()),ZEngineeringCivil::getHouseId);
+        lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getUnitId()),ZEngineeringCivil::getUnitId, zEngineeringCivilBo.getUnitId());
+//            .isNull(!StringUtils.isNotBlank(zEngineeringCivilBo.getUnitId()),ZEngineeringCivil::getUnitId);
+        lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getHouseId()),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());
         lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getEnginClassification()), ZEngineeringCivil::getEnginClassification, zEngineeringCivilBo.getEnginClassification());