mirror of https://gitee.com/stylefeng/roses
【7.3.2】增加批量获取组织机构信息接口
parent
db6a8dd734
commit
c517b75c4d
|
@ -56,6 +56,14 @@ public interface OrganizationServiceApi {
|
||||||
*/
|
*/
|
||||||
HrOrganizationDTO getOrgDetail(Long orgId);
|
HrOrganizationDTO getOrgDetail(Long orgId);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 批量获取组织机构信息详情
|
||||||
|
*
|
||||||
|
* @author fengshuonan
|
||||||
|
* @date 2022/10/31 20:02
|
||||||
|
*/
|
||||||
|
List<HrOrganizationDTO> getOrgDetailList(List<Long> orgIdList);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取组织机构下拉选择树
|
* 获取组织机构下拉选择树
|
||||||
*
|
*
|
||||||
|
|
|
@ -239,8 +239,7 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ObjectUtil.isNotEmpty(hrOrganizationRequest.getOrgName())
|
if (ObjectUtil.isNotEmpty(hrOrganizationRequest.getOrgName()) || ObjectUtil.isNotEmpty(hrOrganizationRequest.getOrgCode())) {
|
||||||
|| ObjectUtil.isNotEmpty(hrOrganizationRequest.getOrgCode())) {
|
|
||||||
return treeNodeList;
|
return treeNodeList;
|
||||||
} else {
|
} else {
|
||||||
return new DefaultTreeBuildFactory<OrganizationTreeNode>().doTreeBuild(treeNodeList);
|
return new DefaultTreeBuildFactory<OrganizationTreeNode>().doTreeBuild(treeNodeList);
|
||||||
|
@ -375,6 +374,16 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
|
||||||
return hrOrganizationDTO;
|
return hrOrganizationDTO;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<HrOrganizationDTO> getOrgDetailList(List<Long> orgIdList) {
|
||||||
|
ArrayList<HrOrganizationDTO> organizationDTOS = new ArrayList<>();
|
||||||
|
for (Long orgId : orgIdList) {
|
||||||
|
HrOrganizationDTO orgDetail = this.getOrgDetail(orgId);
|
||||||
|
organizationDTOS.add(orgDetail);
|
||||||
|
}
|
||||||
|
return organizationDTOS;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<OrganizationTreeNode> getOrgTreeList(HrOrganizationRequest hrOrganizationRequest) {
|
public List<OrganizationTreeNode> getOrgTreeList(HrOrganizationRequest hrOrganizationRequest) {
|
||||||
|
|
||||||
|
@ -519,8 +528,7 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
|
||||||
HrOrganization parentOrganization = this.queryOrganization(hrOrganizationRequest);
|
HrOrganization parentOrganization = this.queryOrganization(hrOrganizationRequest);
|
||||||
|
|
||||||
// 设置本节点的父ids为 (上一个节点的pids + (上级节点的id) )
|
// 设置本节点的父ids为 (上一个节点的pids + (上级节点的id) )
|
||||||
hrOrganization.setOrgPids(
|
hrOrganization.setOrgPids(parentOrganization.getOrgPids() + SymbolConstant.LEFT_SQUARE_BRACKETS + parentOrganization.getOrgId() + SymbolConstant.RIGHT_SQUARE_BRACKETS + SymbolConstant.COMMA);
|
||||||
parentOrganization.getOrgPids() + SymbolConstant.LEFT_SQUARE_BRACKETS + parentOrganization.getOrgId() + SymbolConstant.RIGHT_SQUARE_BRACKETS + SymbolConstant.COMMA);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue