|
@@ -163,11 +163,23 @@ public class MatterManage { |
|
|
.map(m -> { |
|
|
.map(m -> { |
|
|
MattersVO mattersVO = BeanUtil.copyProperties(m, MattersVO.class); |
|
|
MattersVO mattersVO = BeanUtil.copyProperties(m, MattersVO.class); |
|
|
mattersVO.setMatterName(m.getItemName()); |
|
|
mattersVO.setMatterName(m.getItemName()); |
|
|
|
|
|
mattersVO.setId(m.getId()); |
|
|
return mattersVO; |
|
|
return mattersVO; |
|
|
}) |
|
|
}) |
|
|
.collect(Collectors.toList()); |
|
|
.collect(Collectors.toList()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public MattersVO matter(Long id) { |
|
|
|
|
|
NdKqZzsfwMenu matter = menuService.getById(id); |
|
|
|
|
|
if(Objects.isNull(matter)){ |
|
|
|
|
|
return null; |
|
|
|
|
|
} |
|
|
|
|
|
MattersVO mattersVO = BeanUtil.copyProperties(matter, MattersVO.class); |
|
|
|
|
|
mattersVO.setMatterName(matter.getItemName()); |
|
|
|
|
|
mattersVO.setId(matter.getId()); |
|
|
|
|
|
return mattersVO; |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
private List<TreeVO> generateWindows(NdKqZzsfwMenu menu, List<NdKqZzsfwMenu> matters) { |
|
|
private List<TreeVO> generateWindows(NdKqZzsfwMenu menu, List<NdKqZzsfwMenu> matters) { |
|
|
Set<String> windowSet = new HashSet<>(); |
|
|
Set<String> windowSet = new HashSet<>(); |
|
|
return matters.stream().filter(m -> StringUtils.isNotBlank(m.getZoneName()) && m.getZoneName().equals(menu.getZoneName()) |
|
|
return matters.stream().filter(m -> StringUtils.isNotBlank(m.getZoneName()) && m.getZoneName().equals(menu.getZoneName()) |
|
|