|
@@ -182,6 +182,7 @@ public class OrgServiceImpl implements OrgService {
|
|
orgIds.add(programItem.getOrgId());
|
|
orgIds.add(programItem.getOrgId());
|
|
});
|
|
});
|
|
}
|
|
}
|
|
|
|
+
|
|
List<OrgTree> trees=orgMapper.selectTrees(org);
|
|
List<OrgTree> trees=orgMapper.selectTrees(org);
|
|
|
|
|
|
trees=getOrgTree(trees,0,1,orgIds);
|
|
trees=getOrgTree(trees,0,1,orgIds);
|
|
@@ -198,7 +199,7 @@ public class OrgServiceImpl implements OrgService {
|
|
|
|
|
|
if (id.equals(orgTree.getParentOrgId())) {
|
|
if (id.equals(orgTree.getParentOrgId())) {
|
|
//拥有权限可以显示
|
|
//拥有权限可以显示
|
|
- if(set.contains(id)){
|
|
|
|
|
|
+ if(!set.contains(id)){
|
|
orgTree.setDisplay(true);
|
|
orgTree.setDisplay(true);
|
|
}
|
|
}
|
|
List<OrgTree> chidren = getOrgTree(list, orgTree.getId(), ++level,set);
|
|
List<OrgTree> chidren = getOrgTree(list, orgTree.getId(), ++level,set);
|