|
@@ -138,7 +138,7 @@ 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(ZEngineeringCivil::getHouseId, zEngineeringCivilBo.getHouseId());
|
|
|
+ lqw.eq(StringUtils.isNotBlank(zEngineeringCivilBo.getHouseId()),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());
|
|
@@ -238,7 +238,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
|
|
|
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.getHouseId()),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());
|