|
@@ -157,9 +157,33 @@ public class WorkNavigationSettingServiceImpl implements WorkNavigationSettingSe
|
|
|
});
|
|
|
});
|
|
|
|
|
|
+ if(CollUtil.isNotEmpty(treeNodes)){
|
|
|
+ for (Tree<Long> treeNode : treeNodes) {
|
|
|
+ this.fillTree(treeNode);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
return treeNodes;
|
|
|
}
|
|
|
|
|
|
+ private void fillTree(Tree<Long> node){
|
|
|
+ Integer level = null;
|
|
|
+ if((long)node.get("parentId") == 0){
|
|
|
+ level = 0;
|
|
|
+ }else{
|
|
|
+ level = (int)node.getParent().get("level") + 1;
|
|
|
+ }
|
|
|
+ node.put("level", level);
|
|
|
+ List<Tree<Long>> childrenList = (List<Tree<Long>>) node.get("children");
|
|
|
+ if(CollUtil.isEmpty(childrenList)){
|
|
|
+ node.put("children", new ArrayList<>());
|
|
|
+ }else{
|
|
|
+ for (Tree<Long> children : childrenList) {
|
|
|
+ this.fillTree(children);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
@Override
|
|
|
public void noveNavigation(WorkNavigationSettingDto dto) {
|
|
|
List<MoveWorkNavigationDTO> list = dto.getList();
|