|
@@ -175,7 +175,11 @@ public class DatumPointService extends BaseServiceImpl<DatumPointMapper, DatumPo
|
|
|
|
|
|
//导出数据
|
|
//导出数据
|
|
public List<DatumPoint> exportExcel( String contractId , Integer type, String search){
|
|
public List<DatumPoint> exportExcel( String contractId , Integer type, String search){
|
|
- return this.list(Wrappers.<DatumPoint>lambdaQuery().eq(DatumPoint::getType,type).eq(DatumPoint::getContractId,contractId).and(e->e.like(DatumPoint::getName,search).or().like(DatumPoint::getRemark,search)));
|
|
|
|
|
|
+ if(StringUtil.isBlank(search)){
|
|
|
|
+ search="";
|
|
|
|
+ }
|
|
|
|
+ String finalSearch = search;
|
|
|
|
+ return this.list(Wrappers.<DatumPoint>lambdaQuery().eq(DatumPoint::getType,type).eq(DatumPoint::getContractId,contractId).and(e->e.like(DatumPoint::getName, finalSearch).or().like(DatumPoint::getRemark, finalSearch)));
|
|
}
|
|
}
|
|
|
|
|
|
}
|
|
}
|