Commit 417423b5 authored by chenzhao's avatar chenzhao

修改代码

parent 0681b859
......@@ -45,9 +45,13 @@ public class EmergencyTaskController extends BaseController{
public CommonResponse tree(){
Dict dict = new Dict();
dict.setDictCode("YJZC");
//查询应急角色
List<Dict> dictList = dictService.getDictList(dict);
List<EmergencyRelationTree> list = new ArrayList<>();
List<EmergencyRelationTree> root = new ArrayList<>();
List<EmergencyRelationTree> treeNodes = iEmergencyTaskService.treeList();
//组装对应人员节点
dictList.forEach(e->{
EmergencyRelationTree tree = new EmergencyRelationTree();
tree.setId(e.getId());
......@@ -57,13 +61,17 @@ public class EmergencyTaskController extends BaseController{
tree.setChildren(treeNodes.stream().filter(t->t.getObligationId().equals(e.getId())).collect(Collectors.toList()));
list.add(tree);
});
//增加根节点
EmergencyRelationTree tree = new EmergencyRelationTree();
tree.setId(0);
tree.setName("全部");
tree.setType("3");
tree.setCode("0");
tree.setChildren(list);
return CommonResponseUtil.success(tree);
root.add(tree);
return CommonResponseUtil.success(root);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment