|
@ -64,7 +64,7 @@ public class BmsSubjectController { |
|
|
treeNode.setSort(0); |
|
|
treeNode.setSort(0); |
|
|
return treeNode; |
|
|
return treeNode; |
|
|
}).collect(Collectors.toList()); |
|
|
}).collect(Collectors.toList()); |
|
|
if(1==slottingFlag){ |
|
|
if(slottingFlag!=null && slottingFlag==1){ |
|
|
List<BmsSubjectTreeVo> slottingList = treeVoList.stream().filter(a->a.getSlottingFlag().equals(1)).collect(Collectors.toList()); |
|
|
List<BmsSubjectTreeVo> slottingList = treeVoList.stream().filter(a->a.getSlottingFlag().equals(1)).collect(Collectors.toList()); |
|
|
List<BmsSubjectTreeVo> newTreeVoList = new ArrayList<>(); |
|
|
List<BmsSubjectTreeVo> newTreeVoList = new ArrayList<>(); |
|
|
newTreeVoList.addAll(slottingList); |
|
|
newTreeVoList.addAll(slottingList); |
|
|