|
@@ -224,7 +224,7 @@ public class OrgServiceImpl implements OrgService {
|
|
|
|
|
|
|
|
|
|
trees=orgMapper.selectTrees(org);
|
|
trees=orgMapper.selectTrees(org);
|
|
- trees=getOrgTree(trees,id,1);
|
|
|
|
|
|
+ trees=getOrgDepartmentTree(trees,id);
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
@@ -259,7 +259,7 @@ public class OrgServiceImpl implements OrgService {
|
|
/* if(!set.contains(id)){
|
|
/* if(!set.contains(id)){
|
|
orgTree.setDisplay(true);
|
|
orgTree.setDisplay(true);
|
|
}*/
|
|
}*/
|
|
- List<OrgTree> chidren = getOrgTree(list, orgTree.getId(), ++level);
|
|
|
|
|
|
+ List<OrgTree> chidren = getOrgTree(list, orgTree.getId(),level);
|
|
OrgTree temPermission = new OrgTree();
|
|
OrgTree temPermission = new OrgTree();
|
|
BeanUtils.copyProperties(orgTree, temPermission);
|
|
BeanUtils.copyProperties(orgTree, temPermission);
|
|
temPermission.setOrgs(chidren);
|
|
temPermission.setOrgs(chidren);
|
|
@@ -275,5 +275,29 @@ public class OrgServiceImpl implements OrgService {
|
|
return null;
|
|
return null;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ public List<OrgTree> getOrgDepartmentTree(List<OrgTree> list, Integer id) {
|
|
|
|
+ List<OrgTree> temList = newArrayList();
|
|
|
|
+ if (list != null) {
|
|
|
|
+ for (OrgTree orgTree : list) {
|
|
|
|
+
|
|
|
|
+ if (id.equals(orgTree.getParentOrgId())
|
|
|
|
+ &&"department".equals(orgTree.getOrgType())) {
|
|
|
|
+
|
|
|
|
+ List<OrgTree> chidren = getOrgDepartmentTree(list, orgTree.getId());
|
|
|
|
+ OrgTree temPermission = new OrgTree();
|
|
|
|
+ BeanUtils.copyProperties(orgTree, temPermission);
|
|
|
|
+ temPermission.setOrgs(chidren);
|
|
|
|
+ temList.add(temPermission);
|
|
|
|
+ ;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ if (temList.size() > 0) {
|
|
|
|
+ return temList;
|
|
|
|
+ } else {
|
|
|
|
+ return null;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
|
|
}
|
|
}
|