From aa2993a1e29ac8e76f71154c3e00afd884a86370 Mon Sep 17 00:00:00 2001
From: tangwei <tangwei0654@163.com>
Date: Mon, 22 Jun 2026 15:25:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yfd/platform/qgc_base/domain/SdEngInfoBHRequest.java   | 2 ++
 .../qgc_base/service/impl/SdEngInfoBHServiceImpl.java      | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEngInfoBHRequest.java b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEngInfoBHRequest.java
index 402b3bda..4a7f7127 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEngInfoBHRequest.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_base/domain/SdEngInfoBHRequest.java
@@ -13,8 +13,10 @@ public class SdEngInfoBHRequest {
     private String baseId;
     private String hbrvcd;
     private String rvcd;
+    private String reachcd;
     private List<String> basIds;
     private List<String> hbrvcds;
     private List<String> rvcds;
+//    private List<String> rvcds;
     private String ennm;
 }
diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java
index 0ee131b5..44ad3ca1 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdEngInfoBHServiceImpl.java
@@ -94,17 +94,20 @@ public class SdEngInfoBHServiceImpl extends ServiceImpl<SdEngInfoBHMapper, SdEng
         String hbrvcd = sdEngInfoBHRequest.getHbrvcd();
         String ennm = sdEngInfoBHRequest.getEnnm();
         String rvcd = sdEngInfoBHRequest.getRvcd();
+        String reachcd = sdEngInfoBHRequest.getReachcd();
         List<String> rvcds = sdEngInfoBHRequest.getRvcds();
         List<String> hbrvcds = sdEngInfoBHRequest.getHbrvcds();
         LambdaQueryWrapper<SdEngInfoBH> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(StringUtils.hasText(baseId), SdEngInfoBH::getBaseId, baseId)
                 .eq(StringUtils.hasText(hbrvcd), SdEngInfoBH::getHbrvcd, hbrvcd)
+                .eq(StrUtil.isNotBlank(reachcd), SdEngInfoBH::getRvcd, reachcd)
+                .eq(StrUtil.isNotBlank(rvcd), SdEngInfoBH::getReachcd, rvcd)
                 .eq(StrUtil.isNotBlank(rvcd), SdEngInfoBH::getReachcd, rvcd)
                 .in(rvcds != null && !rvcds.isEmpty(), SdEngInfoBH::getReachcd, rvcds)
                 .in(hbrvcds != null && !hbrvcds.isEmpty(), SdEngInfoBH::getHbrvcd, hbrvcds)
                 .like(StringUtils.hasText(ennm), SdEngInfoBH::getEnnm, ennm)
-                .select(SdEngInfoBH::getStcd, SdEngInfoBH::getEnnm, SdEngInfoBH::getBaseId)
-                .orderByAsc(SdEngInfoBH::getOrderIndex);
+                .select(SdEngInfoBH::getStcd, SdEngInfoBH::getEnnm, SdEngInfoBH::getReachcdName, SdEngInfoBH::getYrgeb, SdEngInfoBH::getBaseId)
+                .orderByAsc(SdEngInfoBH::getBaseId,SdEngInfoBH::getOrderIndex);
 
         if("admin".equals(SecurityUtils.getCurrentUsername())){
             return this.list(wrapper);