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