Merge remote-tracking branch 'origin/master'

This commit is contained in:
huangzj
2023-08-31 09:20:28 +08:00

View File

@@ -100,7 +100,7 @@ public class ComponentServiceImpl extends ServiceImpl<ComponentMapper, Component
componentVO.setFunctionGroup(Arrays.stream(item.getFunctionGroup().split(",")).map(s -> Integer.valueOf(s.trim())).collect(Collectors.toList()));
list.add(componentVO);
});
Map<String,List<ComponentVO>> map = list.stream().collect(Collectors.groupingBy(ComponentVO::getSystemType));
Map<String,List<ComponentVO>> map = list.stream().filter(m->!Objects.isNull(m.getSystemType())).collect(Collectors.groupingBy(ComponentVO::getSystemType));
map.forEach((k,v)->{
DictData dictData = dicDataFeignClient.getDicDataById(k).getData();
ComponentVO componentVO = new ComponentVO();