From b7fff4283c6311a5fc302e6f50dd8d62b85f4192 Mon Sep 17 00:00:00 2001
From: yangzhe123 <2824096059@qq.com>
Date: Thu, 28 Aug 2025 14:56:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BD=E8=9A=81-=E9=98=B2=E6=B2=BB=E7=82=B9-?=
 =?UTF-8?q?=E9=98=B2=E6=B2=BB=E9=83=A8=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/gunshi/project/hsz/entity/so/PrePlacePageSo.java    | 6 ++++--
 .../gunshi/project/hsz/service/PrePlaceDetailService.java   | 2 +-
 .../com/gunshi/project/hsz/service/PrePlaceService.java     | 6 +++---
 3 files changed, 8 insertions(+), 6 deletions(-)

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<PrePlaceDetailMapper, Pre
 
     public Page<PrePlaceDetail> pageQuery(PrePlacePageSo pageSo) {
         if(StringUtils.isBlank(pageSo.getPreId())) {
-            throw new RuntimeException("请选择防治点");
+            throw new IllegalArgumentException("请选择防治点");
         }
         LambdaQueryWrapper<PrePlaceDetail> 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<PrePlaceMapper, PrePlace> {
 
     public List<PrePlace> tree(PrePlacePageSo dto) {
         LambdaQueryWrapper<PrePlace> 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<PrePlace> prePlaces = prePlaceMapper.selectList(wrapper);
         Iterator<PrePlace> iterator = prePlaces.iterator();
@@ -51,7 +51,7 @@ public class PrePlaceService extends ServiceImpl<PrePlaceMapper, PrePlace> {
             PrePlace prePlace = iterator.next();
             LambdaQueryWrapper<PrePlaceDetail> 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<PrePlaceDetail> prePlaceDetails = prePlaceDetailMapper.selectList(queryWrapper);