diff --git a/src/main/java/com/hxgk/lowcode/service/impl/HrServiceImpl.java b/src/main/java/com/hxgk/lowcode/service/impl/HrServiceImpl.java index 6b6e5bf..57d202b 100644 --- a/src/main/java/com/hxgk/lowcode/service/impl/HrServiceImpl.java +++ b/src/main/java/com/hxgk/lowcode/service/impl/HrServiceImpl.java @@ -109,7 +109,7 @@ public class HrServiceImpl implements HrService { ArrayList treeList = new ArrayList(); //Long adminorg = 0L;//恒信集团 //Long adminorg = 309L;//高科企管部 - Long adminorg = 312L;//高科 + Long adminorg = 313L;//高科 OrgContType orgContType = queryOrgContTypeByAdminorg(adminorg); findAllUnder(orgContType,allWsList); @@ -258,6 +258,7 @@ public class HrServiceImpl implements HrService { private void findAllUnder(OrgContType org, ArrayList allWsList) { List list = queryLowOrg(org); if (list.size() != 0) { + org.setPersons(userService.getManContListByAdminOrg(org.getId().toString())); for (int i = 0; i < list.size(); i++) { allWsList.add(list.get(i)); findAllUnder(list.get(i), allWsList); diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml index 170821a..ebb1bf0 100644 --- a/src/main/resources/mapper/UserMapper.xml +++ b/src/main/resources/mapper/UserMapper.xml @@ -17,6 +17,9 @@