From 4ba5a2c05d8d9ac7e50f1a03590c03a4c4ad89f1 Mon Sep 17 00:00:00 2001
From: tangwei <tangwei0654@163.com>
Date: Wed, 10 Jun 2026 16:10:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E8=BF=87=E9=B1=BC?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/FishDraftDataServiceImpl.java        | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/backend/src/main/java/com/yfd/platform/qgc_data/service/impl/FishDraftDataServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_data/service/impl/FishDraftDataServiceImpl.java
index b115d968..5a150f58 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_data/service/impl/FishDraftDataServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_data/service/impl/FishDraftDataServiceImpl.java
@@ -353,10 +353,10 @@ public class FishDraftDataServiceImpl extends ServiceImpl<FishDraftDataMapper, F
             if ("RVCD".equals(orgType)) {
                 hbrvcdSet.add(orgId);
 
-                SdRvcdDic hbrv = rvcdDicMapper.selectById(orgId);
-                if (hbrv != null && hbrv.getRvnm() != null) {
-                    hbrvnmSet.add(hbrv.getRvnm());
-                }
+//                SdRvcdDic hbrv = rvcdDicMapper.selectById(orgId);
+//                if (hbrv != null && hbrv.getRvnm() != null) {
+//                    hbrvnmSet.add(hbrv.getRvnm());
+//                }
 
                 List<SdEngInfoBH> stationList = engInfoBHMapper.selectByRvcd(null,orgId);
                 if (stationList != null) {
@@ -367,14 +367,17 @@ public class FishDraftDataServiceImpl extends ServiceImpl<FishDraftDataMapper, F
                         if (station.getEnnm() != null) {
                             ennmSet.add(station.getEnnm());
                         }
+                        if(station.getReachcdName() != null){
+                            hbrvnmSet.add(station.getReachcdName());
+                        }
                     }
                 }
 
             } else if ("STATION".equals(orgType)) {
                 SdEngInfoBH station = engInfoBHMapper.selectById(orgId);
                 if (station != null) {
-                    if (station.getRvcd() != null) {
-                        hbrvcdSet.add(station.getRvcd());
+                    if (station.getReachcd() != null) {
+                        hbrvcdSet.add(station.getReachcd());
                     }
                     if (station.getStcd() != null) {
                         stcdSet.add(station.getStcd());
@@ -382,11 +385,14 @@ public class FishDraftDataServiceImpl extends ServiceImpl<FishDraftDataMapper, F
                     if (station.getEnnm() != null) {
                         ennmSet.add(station.getEnnm());
                     }
-
-                    SdRvcdDic hbrv = rvcdDicMapper.selectById(station.getRvcd());
-                    if (hbrv != null && hbrv.getRvnm() != null) {
-                        hbrvnmSet.add(hbrv.getRvnm());
+                    if(station.getReachcdName() != null){
+                        hbrvnmSet.add(station.getReachcdName());
                     }
+
+//                    SdRvcdDic hbrv = rvcdDicMapper.selectById(station.getRvcd());
+//                    if (hbrv != null && hbrv.getRvnm() != null) {
+//                        hbrvnmSet.add(hbrv.getRvnm());
+//                    }
                 }
             }
         }