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 { * 注册场景下拉框查询 */ List selectRegDropdown(@Param("rvnm") String rvnm, @Param("rvcd") String rvcd); + + /** + * 注册场景下拉框查询,仅返回能被电站表 RVCD 命中的流域 + */ + List 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 regDropdown(String rvnm, String rvcd) { - return this.baseMapper.selectRegDropdown(rvnm, rvcd); + return this.baseMapper.selectRegDropdownWithEng(rvnm, rvcd); } private void buildTreeRecursive(SdRvcdDic parent, Map> childrenMap, Set 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 + +