hym пре 4 година
родитељ
комит
5cd58928a3
1 измењених фајлова са 26 додато и 2 уклоњено
  1. 26 2
      user_center/src/main/java/com/huaxu/service/impl/OrgServiceImpl.java

+ 26 - 2
user_center/src/main/java/com/huaxu/service/impl/OrgServiceImpl.java

@@ -224,7 +224,7 @@ public class OrgServiceImpl implements OrgService {
 
 
                 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)){
                         orgTree.setDisplay(true);
                     }*/
-                    List<OrgTree> chidren = getOrgTree(list, orgTree.getId(), ++level);
+                    List<OrgTree> chidren = getOrgTree(list, orgTree.getId(),level);
                     OrgTree temPermission = new OrgTree();
                     BeanUtils.copyProperties(orgTree, temPermission);
                     temPermission.setOrgs(chidren);
@@ -275,5 +275,29 @@ public class OrgServiceImpl implements OrgService {
             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;
+        }
+    }
 
 }