|
|
@ -109,7 +109,7 @@ public class HrServiceImpl implements HrService { |
|
|
ArrayList<Tree> treeList = new ArrayList(); |
|
|
ArrayList<Tree> treeList = new ArrayList(); |
|
|
//Long adminorg = 0L;//恒信集团
|
|
|
//Long adminorg = 0L;//恒信集团
|
|
|
//Long adminorg = 309L;//高科企管部
|
|
|
//Long adminorg = 309L;//高科企管部
|
|
|
Long adminorg = 312L;//高科
|
|
|
Long adminorg = 313L;//高科
|
|
|
|
|
|
|
|
|
OrgContType orgContType = queryOrgContTypeByAdminorg(adminorg); |
|
|
OrgContType orgContType = queryOrgContTypeByAdminorg(adminorg); |
|
|
findAllUnder(orgContType,allWsList); |
|
|
findAllUnder(orgContType,allWsList); |
|
|
@ -258,6 +258,7 @@ public class HrServiceImpl implements HrService { |
|
|
private void findAllUnder(OrgContType org, ArrayList<OrgContType> allWsList) { |
|
|
private void findAllUnder(OrgContType org, ArrayList<OrgContType> allWsList) { |
|
|
List<OrgContType> list = queryLowOrg(org); |
|
|
List<OrgContType> list = queryLowOrg(org); |
|
|
if (list.size() != 0) { |
|
|
if (list.size() != 0) { |
|
|
|
|
|
org.setPersons(userService.getManContListByAdminOrg(org.getId().toString())); |
|
|
for (int i = 0; i < list.size(); i++) { |
|
|
for (int i = 0; i < list.size(); i++) { |
|
|
allWsList.add(list.get(i)); |
|
|
allWsList.add(list.get(i)); |
|
|
findAllUnder(list.get(i), allWsList); |
|
|
findAllUnder(list.get(i), allWsList); |
|
|
|