根据开关id获取名称缺陷修复

services/load-transfer-bf/src/main/java/com/hdkj/lt/bf/service/impl/FaultPowerCutServiceImpl.java

@@ -78,7 +78,7 @@ public class FaultPowerCutServiceImpl extends ServiceImpl<FaultPowerCutMapper, F
     private FeederTopoMapper feederTopoMapper;
 
     @Override
-    @UserCountyCodeAuto(sourceFiled = "countyCode", targetFiled = "countyCodeList")
+//    @UserCountyCodeAuto(sourceFiled = "countyCode", targetFiled = "countyCodeList")
     public Page<FhzgFaultPowerCutVO> getSchemeList(FaultPowerCut obj) {
         Page<FhzgFaultPowerCutVO> page = new Page<>();
         page.setCurrent(obj.getPageNum());
@@ -109,7 +109,8 @@ public class FaultPowerCutServiceImpl extends ServiceImpl<FaultPowerCutMapper, F
                     return Stream.concat(start, end);
                 }).distinct().collect(Collectors.toList());
                 //根据开关id获取名称
-                Map<String, String> switchNameMap = feederTopoMapper.selectList(new LambdaQueryWrapper<FeederTopo>().in(FeederTopo::getPsrId, allSwitchIdList)).stream().collect(Collectors.toMap(FeederTopo::getPsrId, FeederTopo::getName));
+                Map<String, String> switchNameMap = feederTopoMapper.selectList(new LambdaQueryWrapper<FeederTopo>().in(FeederTopo::getPsrId, allSwitchIdList))
+                        .stream().collect(Collectors.toMap(FeederTopo::getPsrId, FeederTopo::getName,(v1,v2)->v1));
                 //根据FaultNo，并按SectionStatus，CreateTime倒序排序
                 sectionMap = faultPowerCutSectionList.stream()
                         .peek(p->p.setStartSwitchName(switchNameMap.get(p.getStartSwitch())).setEndSwitchName(joinEndStartSwitch(switchNameMap,p.getEndSwitch()))