From c29beec53b216e1b46e244ba0f8b5e581fd5b2be Mon Sep 17 00:00:00 2001
From: tangwei <tangwei0654@163.com>
Date: Tue, 9 Jun 2026 09:13:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=BF=87=E9=B1=BC=E5=A1=AB=E6=8A=A5?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/FishDraftDataServiceImpl.java        | 30 +++++++++++--------
 1 file changed, 18 insertions(+), 12 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 62aa0e8c..b115d968 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
@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yfd.platform.common.DataSourceLoadOptionsBase;
 import com.yfd.platform.common.DataSourceRequest;
+import com.yfd.platform.qgc_base.domain.SdRvcdDic;
+import com.yfd.platform.qgc_base.mapper.SdRvcdDicMapper;
 import com.yfd.platform.qgc_data.domain.ApprovalMain;
 import com.yfd.platform.qgc_data.domain.FishDraftData;
 import com.yfd.platform.qgc_data.domain.SysUserDataScope;
@@ -73,6 +75,10 @@ public class FishDraftDataServiceImpl extends ServiceImpl<FishDraftDataMapper, F
     @Resource
     private SdHbrvDicMapper hbrvDicMapper;
 
+    @Resource
+    private SdRvcdDicMapper rvcdDicMapper;
+
+
     @Resource
     private SdFpssRMapper sdFpssRMapper;
 
@@ -344,15 +350,15 @@ public class FishDraftDataServiceImpl extends ServiceImpl<FishDraftDataMapper, F
                 continue;
             }
 
-            if ("HBRVCD".equals(orgType)) {
+            if ("RVCD".equals(orgType)) {
                 hbrvcdSet.add(orgId);
 
-                SdHbrvDic hbrv = hbrvDicMapper.selectById(orgId);
-                if (hbrv != null && hbrv.getHbrvnm() != null) {
-                    hbrvnmSet.add(hbrv.getHbrvnm());
+                SdRvcdDic hbrv = rvcdDicMapper.selectById(orgId);
+                if (hbrv != null && hbrv.getRvnm() != null) {
+                    hbrvnmSet.add(hbrv.getRvnm());
                 }
 
-                List<SdEngInfoBH> stationList = engInfoBHMapper.selectByHbrvcd(orgId);
+                List<SdEngInfoBH> stationList = engInfoBHMapper.selectByRvcd(null,orgId);
                 if (stationList != null) {
                     for (SdEngInfoBH station : stationList) {
                         if (station.getStcd() != null) {
@@ -367,8 +373,8 @@ public class FishDraftDataServiceImpl extends ServiceImpl<FishDraftDataMapper, F
             } else if ("STATION".equals(orgType)) {
                 SdEngInfoBH station = engInfoBHMapper.selectById(orgId);
                 if (station != null) {
-                    if (station.getHbrvcd() != null) {
-                        hbrvcdSet.add(station.getHbrvcd());
+                    if (station.getRvcd() != null) {
+                        hbrvcdSet.add(station.getRvcd());
                     }
                     if (station.getStcd() != null) {
                         stcdSet.add(station.getStcd());
@@ -377,19 +383,19 @@ public class FishDraftDataServiceImpl extends ServiceImpl<FishDraftDataMapper, F
                         ennmSet.add(station.getEnnm());
                     }
 
-                    SdHbrvDic hbrv = hbrvDicMapper.selectById(station.getHbrvcd());
-                    if (hbrv != null && hbrv.getHbrvnm() != null) {
-                        hbrvnmSet.add(hbrv.getHbrvnm());
+                    SdRvcdDic hbrv = rvcdDicMapper.selectById(station.getRvcd());
+                    if (hbrv != null && hbrv.getRvnm() != null) {
+                        hbrvnmSet.add(hbrv.getRvnm());
                     }
                 }
             }
         }
 
         if (!hbrvcdSet.isEmpty()) {
-            approvalMain.setHbrvcd(String.join(",", hbrvcdSet));
+            approvalMain.setRvcd(String.join(",", hbrvcdSet));
         }
         if (!hbrvnmSet.isEmpty()) {
-            approvalMain.setHbrvnm(String.join(",", hbrvnmSet));
+            approvalMain.setRvnm(String.join(",", hbrvnmSet));
         }
         if (!stcdSet.isEmpty()) {
             approvalMain.setStcd(String.join(",", stcdSet));