From 4522383206a8e9edbb1dd0558028e7bf4746e919 Mon Sep 17 00:00:00 2001
From: tangwei <tangwei0654@163.com>
Date: Fri, 5 Jun 2026 13:54:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BF=87=E9=B1=BC=E5=A1=AB=E6=8A=A5?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../yfd/platform/qgc_base/mapper/SdEngInfoBHMapper.java  | 5 ++++-
 .../qgc_data/service/impl/FishImportServiceImpl.java     | 6 +++---
 .../main/resources/mapper/qgc_base/SdEngInfoBHMapper.xml | 9 +++++++++
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdEngInfoBHMapper.java b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdEngInfoBHMapper.java
index 98945a3b..2c886d73 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdEngInfoBHMapper.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdEngInfoBHMapper.java
@@ -44,7 +44,10 @@ public interface SdEngInfoBHMapper extends BaseMapper<SdEngInfoBH> {
      * 根据基地流域编码列表批量查询电站
      */
     List<SdEngInfoBH> selectByRvcdList(@Param("rvcdList") List<String> rvcdList);
-
+    /**
+     * 根据基地流域编码列表批量查询电站
+     */
+    List<SdEngInfoBH> selectByReachcdList(@Param("rvcdList") List<String> rvcdList);
 
     List<StationBasinInfo> selectStationBasinInfo();
 }
diff --git a/backend/src/main/java/com/yfd/platform/qgc_data/service/impl/FishImportServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_data/service/impl/FishImportServiceImpl.java
index 13f0f4c8..a0f59e16 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_data/service/impl/FishImportServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_data/service/impl/FishImportServiceImpl.java
@@ -215,7 +215,7 @@ public class FishImportServiceImpl implements IFishImportService {
 
         if (!allowedRvcdSet.isEmpty() || !directStcdSet.isEmpty()) {
             if (!allowedRvcdSet.isEmpty()) {
-                List<SdEngInfoBH> stationsFromHbrv = engInfoBHMapper.selectByRvcdList(new ArrayList<>(allowedRvcdSet));
+                List<SdEngInfoBH> stationsFromHbrv = engInfoBHMapper.selectByReachcdList(new ArrayList<>(allowedRvcdSet));
                 for (SdEngInfoBH station : stationsFromHbrv) {
                     if (station.getStcd() != null) {
                         directStcdSet.add(station.getStcd());
@@ -230,7 +230,7 @@ public class FishImportServiceImpl implements IFishImportService {
                         directStcdSet.add(station.getStcd());
                     }
                     if (station.getRvcd() != null) {
-                        allowedRvcdSet.add(station.getRvcd());
+                        allowedRvcdSet.add(station.getReachcd());
                     }
                 }
             }
@@ -1146,7 +1146,7 @@ public class FishImportServiceImpl implements IFishImportService {
         return findFirst(engInfoBHMapper.selectList(new LambdaQueryWrapper<SdEngInfoBH>()
                 .select(SdEngInfoBH::getStcd)
                 .eq(SdEngInfoBH::getStcd, normalizedStationCode)
-                .eq(SdEngInfoBH::getRvcd, normalizedRvcd))) != null;
+                .eq(SdEngInfoBH::getReachcd, normalizedRvcd))) != null;
     }
 
     @Override
diff --git a/backend/src/main/resources/mapper/qgc_base/SdEngInfoBHMapper.xml b/backend/src/main/resources/mapper/qgc_base/SdEngInfoBHMapper.xml
index b33d0dca..515f6b3f 100644
--- a/backend/src/main/resources/mapper/qgc_base/SdEngInfoBHMapper.xml
+++ b/backend/src/main/resources/mapper/qgc_base/SdEngInfoBHMapper.xml
@@ -331,5 +331,14 @@
         ORDER BY HBRVCD, ORDER_INDEX ASC
     </select>
 
+    <select id="selectByReachcdList" resultMap="BaseResultMap">
+        SELECT * FROM SD_ENGINFO_B_H
+        WHERE REACHCD IN
+        <foreach collection="rvcdList" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+        ORDER BY RVCD, ORDER_INDEX ASC
+    </select>
+
 
 </mapper>