|
@@ -288,6 +288,7 @@ public class UserServiceImpl implements UserService {
|
|
|
Map<Integer, List<Org>> allOrgs = getAllOrgs(null,user.getTenantId());
|
|
|
ProgramItem programItem=new ProgramItem();
|
|
|
programItem.setOrgId(user.getCompanyOrgId());
|
|
|
+ programItem.setOrgCompanyId(user.getCompanyOrgId());
|
|
|
getOrg(user.getCompanyOrgId(),allOrgs,programItemList);
|
|
|
programItemList.add(programItem);
|
|
|
|
|
@@ -299,6 +300,7 @@ public class UserServiceImpl implements UserService {
|
|
|
}else if(permissionType==4) {
|
|
|
ProgramItem programItem=new ProgramItem();
|
|
|
programItem.setOrgId(user.getDeptOrgId());
|
|
|
+ programItem.setOrgDeparmtmentId(user.getDeptOrgId());
|
|
|
Map<Integer, List<Org>> allOrgs = getAllOrgs("department",user.getTenantId());
|
|
|
getOrg(user.getDeptOrgId(),allOrgs,programItemList);
|
|
|
programItemList.add(programItem);
|