From 17007d8a18495713b5c13c76f21f531358bbd675 Mon Sep 17 00:00:00 2001
From: tangwei <tangwei0654@163.com>
Date: Thu, 4 Jun 2026 18:28:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=8B=E6=8B=89=E6=A1=86=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2(=E6=B3=A8=E5=86=8C)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qgc_base/mapper/SdRvcdDicMapper.java      |  5 ++
 .../service/impl/SdRvcdDicServiceImpl.java    |  2 +-
 .../mapper/qgc_base/SdRvcdDicMapper.xml       | 82 +++++++++++++++++++
 3 files changed, 88 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdRvcdDicMapper.java b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdRvcdDicMapper.java
index 07e27cc9..537d2e5f 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdRvcdDicMapper.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_base/mapper/SdRvcdDicMapper.java
@@ -27,4 +27,9 @@ public interface SdRvcdDicMapper extends BaseMapper<SdRvcdDic> {
      * 注册场景下拉框查询
      */
     List<SdRvcdDic> selectRegDropdown(@Param("rvnm") String rvnm, @Param("rvcd") String rvcd);
+
+    /**
+     * 注册场景下拉框查询，仅返回能被电站表 RVCD 命中的流域
+     */
+    List<SdRvcdDic> selectRegDropdownWithEng(@Param("rvnm") String rvnm, @Param("rvcd") String rvcd);
 }
diff --git a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdRvcdDicServiceImpl.java b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdRvcdDicServiceImpl.java
index a98cc3fc..f1768cd5 100644
--- a/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdRvcdDicServiceImpl.java
+++ b/backend/src/main/java/com/yfd/platform/qgc_base/service/impl/SdRvcdDicServiceImpl.java
@@ -216,7 +216,7 @@ public class SdRvcdDicServiceImpl extends ServiceImpl<SdRvcdDicMapper, SdRvcdDic
 
     @Override
     public List<SdRvcdDic> regDropdown(String rvnm, String rvcd) {
-        return this.baseMapper.selectRegDropdown(rvnm, rvcd);
+        return this.baseMapper.selectRegDropdownWithEng(rvnm, rvcd);
     }
 
     private void buildTreeRecursive(SdRvcdDic parent, Map<String, List<SdRvcdDic>> childrenMap, Set<String> rootRvcdSet) {
diff --git a/backend/src/main/resources/mapper/qgc_base/SdRvcdDicMapper.xml b/backend/src/main/resources/mapper/qgc_base/SdRvcdDicMapper.xml
index 1bc653d5..fe7a7a8c 100644
--- a/backend/src/main/resources/mapper/qgc_base/SdRvcdDicMapper.xml
+++ b/backend/src/main/resources/mapper/qgc_base/SdRvcdDicMapper.xml
@@ -129,4 +129,86 @@
         ORDER BY t.ORDER_PATH ASC, t.RVCD ASC
     </select>
 
+    <select id="selectRegDropdownWithEng" resultMap="BaseResultMap">
+        SELECT
+            t.RVCD,
+            t.DISPLAY_RVNM AS RVNM,
+            t.PRVCD,
+            t.GRD,
+            t.PATH,
+            t.ORDER_INDEX,
+            t.LGTD,
+            t.LTTD,
+            t.AREA,
+            t.PERIMETER,
+            t.COUNTRY,
+            t.LOGO,
+            t.INTRODUCE,
+            t.INFFILE,
+            t.SHORTNAME,
+            t.SHEPRANGE,
+            t.BASEID,
+            t.ENABLED,
+            t.RECORD_USER,
+            t.RECORD_TIME,
+            t.MODIFY_USER,
+            t.MODIFY_TIME,
+            t.IS_DELETED,
+            t.DELETE_USER,
+            t.DELETE_TIME
+        FROM (
+            SELECT
+                d.RVCD,
+                LTRIM(SYS_CONNECT_BY_PATH(d.RVNM, '-'), '-') AS DISPLAY_RVNM,
+                d.PRVCD,
+                d.GRD,
+                d.PATH,
+                d.ORDER_INDEX,
+                d.LGTD,
+                d.LTTD,
+                d.AREA,
+                d.PERIMETER,
+                d.COUNTRY,
+                d.LOGO,
+                d.INTRODUCE,
+                d.INFFILE,
+                d.SHORTNAME,
+                d.SHEPRANGE,
+                d.BASEID,
+                d.ENABLED,
+                d.RECORD_USER,
+                d.RECORD_TIME,
+                d.MODIFY_USER,
+                d.MODIFY_TIME,
+                d.IS_DELETED,
+                d.DELETE_USER,
+                d.DELETE_TIME,
+                SYS_CONNECT_BY_PATH(LPAD(NVL(d.ORDER_INDEX, 999999999), 10, '0'), '/') AS ORDER_PATH,
+                LEVEL AS TREE_LEVEL
+            FROM (
+                SELECT *
+                FROM SD_RVCD_DIC
+                WHERE NVL(ENABLED, 1) = 1
+                  AND NVL(IS_DELETED, 0) = 0
+            ) d
+            START WITH d.PRVCD IS NULL OR d.PRVCD = '' OR d.PRVCD = '0'
+            CONNECT BY PRIOR d.RVCD = d.PRVCD
+            ORDER SIBLINGS BY d.ORDER_INDEX ASC, d.RVCD ASC
+        ) t
+        WHERE t.TREE_LEVEL > 1
+          AND EXISTS (
+            SELECT 1
+            FROM SD_ENGINFO_B_H eng
+            WHERE eng.RVCD = t.RVCD
+              AND NVL(eng.IS_DELETED, 0) = 0
+          )
+        <if test="rvcd != null and rvcd != ''">
+            AND t.RVCD = #{rvcd}
+        </if>
+        <if test="rvnm != null and rvnm != ''">
+            AND t.DISPLAY_RVNM LIKE '%' || #{rvnm} || '%'
+        </if>
+        ORDER BY t.ORDER_PATH ASC, t.RVCD ASC
+    </select>
+
 </mapper>