diff --git a/src/main/java/com/gunshi/project/hsz/entity/so/PrePlacePageSo.java b/src/main/java/com/gunshi/project/hsz/entity/so/PrePlacePageSo.java index 23f3b4e..09b864f 100644 --- a/src/main/java/com/gunshi/project/hsz/entity/so/PrePlacePageSo.java +++ b/src/main/java/com/gunshi/project/hsz/entity/so/PrePlacePageSo.java @@ -14,8 +14,10 @@ public class PrePlacePageSo { @Schema(description = "分页参数") private PageSo pageSo; - private String preId; - private String preName; + private String preDetailName; + + private String preId; + } diff --git a/src/main/java/com/gunshi/project/hsz/service/PrePlaceDetailService.java b/src/main/java/com/gunshi/project/hsz/service/PrePlaceDetailService.java index 05b154b..375becb 100644 --- a/src/main/java/com/gunshi/project/hsz/service/PrePlaceDetailService.java +++ b/src/main/java/com/gunshi/project/hsz/service/PrePlaceDetailService.java @@ -33,7 +33,7 @@ public class PrePlaceDetailService extends ServiceImpl pageQuery(PrePlacePageSo pageSo) { if(StringUtils.isBlank(pageSo.getPreId())) { - throw new RuntimeException("请选择防治点"); + throw new IllegalArgumentException("请选择防治点"); } LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(PrePlaceDetail::getPreId, pageSo.getPreId()); diff --git a/src/main/java/com/gunshi/project/hsz/service/PrePlaceService.java b/src/main/java/com/gunshi/project/hsz/service/PrePlaceService.java index 6ead1bc..5e96407 100644 --- a/src/main/java/com/gunshi/project/hsz/service/PrePlaceService.java +++ b/src/main/java/com/gunshi/project/hsz/service/PrePlaceService.java @@ -42,8 +42,8 @@ public class PrePlaceService extends ServiceImpl { public List tree(PrePlacePageSo dto) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - if(!StringUtils.isBlank(dto.getPreId())){ - wrapper.eq(PrePlace::getId, dto.getPreId()); + if(!StringUtils.isBlank(dto.getPreName())){ + wrapper.like(PrePlace::getId, dto.getPreName()); } List prePlaces = prePlaceMapper.selectList(wrapper); Iterator iterator = prePlaces.iterator(); @@ -51,7 +51,7 @@ public class PrePlaceService extends ServiceImpl { PrePlace prePlace = iterator.next(); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); if(!StringUtils.isBlank(dto.getPreName())){ - queryWrapper.like(PrePlaceDetail::getDetailName, dto.getPreName()); + queryWrapper.like(PrePlaceDetail::getDetailName, dto.getPreDetailName()); } queryWrapper.eq(PrePlaceDetail::getPreId, prePlace.getId()); List prePlaceDetails = prePlaceDetailMapper.selectList(queryWrapper);