diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index 1c08045b..24adca2b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -244,11 +244,14 @@ public class SarStandItemsServiceImpl extends ServiceImpl> getFileType(String standId){ List fileType = dao.getFileType(standId); - List> collect = InitStandAttrUtil.standInlandAttrFieldList.stream() + Map typeNameMap = InitStandAttrUtil.standInlandAttrFieldList.stream() + .collect(Collectors.toMap(SarStandAttrDetails::getAttrField, SarStandAttrDetails::getAttrName)); + + List> collect = fileType.stream() .map(item -> { Map map = new HashMap<>(); - map.put("label", item.getAttrName()); - map.put("value", item.getAttrField()); + map.put("label", typeNameMap.get(item)); + map.put("value", item); return map; }).collect(Collectors.toList());