Commit f8acd2d3 authored by xixinzhao's avatar xixinzhao

修改根据登陆人获取单位列表

parent abe462ac
...@@ -1198,11 +1198,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp ...@@ -1198,11 +1198,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
} }
Set<Long> set = new HashSet<>(); Set<Long> set = new HashSet<>();
orgUsrList.forEach(orgUsr -> { orgUsrList.forEach(orgUsr -> {
Long parent = ObjectUtils.isEmpty(orgUsr.getParentId()) ? 0L : Long.parseLong(orgUsr.getParentId()); if (!StringUtils.isEmpty(orgUsr.getParentId())) {
if (set.add(parent)) { Long parent = Long.parseLong(orgUsr.getParentId());
Long companyIdByDto = getCompanyIdByDto(parent, companyList); if (set.add(parent)) {
List<CheckObjectDto> orgUsrTreeDtoList = this.baseMapper.getCompanyAndKeySite(companyIdByDto); Long companyIdByDto = getCompanyIdByDto(parent, companyList);
list.addAll(companyAndKeySiteList(orgUsrTreeDtoList)); List<CheckObjectDto> orgUsrTreeDtoList = this.baseMapper.getCompanyAndKeySite(companyIdByDto);
list.addAll(companyAndKeySiteList(orgUsrTreeDtoList));
}
} }
}); });
// 返回所在用户单位列表 // 返回所在用户单位列表
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment