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 00b83828..07e27cc9 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 @@ -22,4 +22,9 @@ public interface SdRvcdDicMapper extends BaseMapper { * 查询所有根流域 */ List selectRootList(); + + /** + * 注册场景下拉框查询 + */ + List selectRegDropdown(@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 b962fdc6..9f6fce88 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 @@ -222,12 +222,7 @@ public class SdRvcdDicServiceImpl extends ServiceImpl regDropdown(String rvnm, String rvcd) { - return this.lambdaQuery() - .like(rvnm != null && !rvnm.isEmpty(), SdRvcdDic::getRvnm, rvnm) - .eq(rvcd != null && !rvcd.isEmpty(), SdRvcdDic::getRvcd, rvcd) - .eq(SdRvcdDic::getEnabled, 1) - .orderByAsc(SdRvcdDic::getBaseid,SdRvcdDic::getOrderIndex) - .list(); + return this.baseMapper.selectRegDropdown(rvnm, rvcd); } private void buildTreeRecursive(SdRvcdDic parent, Map> childrenMap, Set rootRvcdSet) { @@ -241,4 +236,8 @@ public class SdRvcdDicServiceImpl extends ServiceImpl()); } } -} \ No newline at end of file + + private boolean isRootRvcd(SdRvcdDic item) { + return item == null || !StringUtils.hasText(item.getPrvcd()) || "0".equals(item.getPrvcd()); + } +} diff --git a/backend/src/main/resources/mapper/qgc_base/SdRvcdDicMapper.xml b/backend/src/main/resources/mapper/qgc_base/SdRvcdDicMapper.xml index 913d985a..1bc653d5 100644 --- a/backend/src/main/resources/mapper/qgc_base/SdRvcdDicMapper.xml +++ b/backend/src/main/resources/mapper/qgc_base/SdRvcdDicMapper.xml @@ -53,4 +53,80 @@ ORDER BY ORDER_INDEX ASC + +