From 272b85b275c040449dee9ce5664f90c15e21cc13 Mon Sep 17 00:00:00 2001
From: tangwei <tangwei0654@163.com>
Date: Thu, 4 Jun 2026 17:17:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B5=81=E5=9F=9F=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qgc_base/service/impl/SdRvcdDicServiceImpl.java  | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

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 9f6fce88..a98cc3fc 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
@@ -118,14 +118,9 @@ public class SdRvcdDicServiceImpl extends ServiceImpl<SdRvcdDicMapper, SdRvcdDic
 
     @Override
     public List<SdRvcdDic> selectForDropdown(String rvnm, String rvcd) {
-
-        LambdaQueryWrapper<SdRvcdDic> wrapper = new LambdaQueryWrapper<>();
-        wrapper.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<SdRvcdDic> dropdownList = this.baseMapper.selectRegDropdown(rvnm, rvcd);
         if("admin".equals(SecurityUtils.getCurrentUsername())){
-            return this.list(wrapper);
+            return dropdownList;
         }
         Set<String> authorizedStations = getUserAuthorizedStationCodes();
         if (authorizedStations != null && !authorizedStations.isEmpty()) {
@@ -141,8 +136,7 @@ public class SdRvcdDicServiceImpl extends ServiceImpl<SdRvcdDicMapper, SdRvcdDic
                     .toList();
 
             if (!rvcds.isEmpty()) {
-                List<SdRvcdDic> list = this.list(wrapper);
-                return list.stream()
+                return dropdownList.stream()
                         .filter(rvcdDic -> rvcds.contains(rvcdDic.getRvcd()))
                         .collect(Collectors.toList());
             } else {