Jelajahi Sumber

测站点问题修复

yangyj 3 tahun lalu
induk
melakukan
799ab239d4

+ 5 - 1
blade-service/blade-business/src/main/java/org/springblade/business/service/impl/DatumPointService.java

@@ -175,7 +175,11 @@ public class DatumPointService extends BaseServiceImpl<DatumPointMapper, DatumPo
 
     //导出数据
     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)));
     }
 
 }