gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【7.2.5】【org】更新获取上级部门的方法

pull/37/head
fengshuonan 2022-10-01 13:51:51 +08:00
parent e84f8a2ca7
commit aff8e14eae
2 changed files with 73 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/api/OrganizationServiceApi.java
View File

@ -73,13 +73,28 @@ public interface OrganizationServiceApi {
/**
* 获取指定组织机构的上级组织机构是什么
* <p>
* 逐级向上获取直到获取到最高级
*
* @param orgId 指定机构id
* @param parentLevelNum 上级机构的层级数，从0开始
* @param parentLevelNum 上级机构的层级数，从0开始，0代表直接返回本部门
* @return 上级机构的id
* @author fengshuonan
* @date 2022/9/18 15:02
*/
Long getParentLevelOrgId(Long orgId, Integer parentLevelNum);
/**
* 获取该部门从最高一级上级开始计算的子组织
* <p>
* 逐级向下获取，直到获取到本层机构
*
* @param orgId 指定机构id
* @param highestLevelNum 自上而下的层级数，从0开始，0代表直接返回本部门
* @return 计算后的上级机构id
* @author fengshuonan
* @date 2022/10/1 11:37
*/
Long getHighestLevelOrgId(Long orgId, Integer highestLevelNum);
}

94
kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrOrganizationServiceImpl.java
View File

@ -415,44 +415,12 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
@Override
public Long getParentLevelOrgId(Long orgId, Integer parentLevelNum) {
return calcParentOrgId(orgId, parentLevelNum, true);
}
if (ObjectUtil.isEmpty(orgId) || ObjectUtil.isEmpty(parentLevelNum)) {
return null;
}
// 如果上级层数为0，则直接返回参数的orgId，代表同级别组织机构
if (parentLevelNum == 0) {
return orgId;
}
// 获取当前部门的所有父级id
HrOrganization hrOrganization = this.getById(orgId);
if (hrOrganization == null || StrUtil.isEmpty(hrOrganization.getOrgPids())) {
return null;
}
String orgParentIdListStr = hrOrganization.getOrgPids();
String[] orgParentIdList = orgParentIdListStr.split(",");
String[] orgParentIdListReverse = ArrayUtil.reverse(orgParentIdList);
// 根据请求参数，需要从orgParentIdListReverse获取的下表
int needGetArrayIndex = parentLevelNum - 1;
// orgParentIdListReverse最大能提供的下表，这里为什么是-2，因为所有组织机构，最顶级的父级id是[-1]，[-1]是不存在
int maxCanGetIndex = orgParentIdListReverse.length - 2;
// 如果没有最顶级的上级，则他本身就是最顶级上级
if (maxCanGetIndex < 0) {
return orgId;
}
// 根据参数传参，进行获取上级的操作
String orgIdString;
if (needGetArrayIndex <= (maxCanGetIndex)) {
orgIdString = orgParentIdListReverse[needGetArrayIndex];
} else {
orgIdString = orgParentIdListReverse[maxCanGetIndex];
}
return Long.valueOf(orgIdString);
@Override
public Long getHighestLevelOrgId(Long orgId, Integer highestLevelNum) {
return calcParentOrgId(orgId, highestLevelNum, false);
}
/**
@ -589,4 +557,56 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
return this.list(queryWrapper);
}
/**
* 计算获取上级组织机构id
*
* @param orgId 指定机构id
* @param parentLevelNum 上级机构的层级数，从0开始，0代表不计算直接返回本身
* @param reverse 是否反转，true-代表自下而上计算，false-代表自上而下计算
* @author fengshuonan
* @date 2022/10/1 11:45
*/
private Long calcParentOrgId(Long orgId, Integer parentLevelNum, boolean reverse) {
if (ObjectUtil.isEmpty(orgId) || ObjectUtil.isEmpty(parentLevelNum)) {
return null;
}
// 如果上级层数为0，则直接返回参数的orgId，代表同级别组织机构
if (parentLevelNum == 0) {
return orgId;
}
// 获取当前部门的所有父级id
HrOrganization hrOrganization = this.getById(orgId);
if (hrOrganization == null || StrUtil.isEmpty(hrOrganization.getOrgPids())) {
return null;
}
String orgParentIdListStr = hrOrganization.getOrgPids();
String[] orgParentIdList = orgParentIdListStr.split(",");
if (reverse) {
orgParentIdList = ArrayUtil.reverse(orgParentIdList);
}
// 根据请求参数，需要从orgParentIdList获取的下标
int needGetArrayIndex = parentLevelNum - 1;
// orgParentIdList最大能提供的下表，这里为什么是-2，因为所有组织机构，最顶级的父级id是[-1]，[-1]是不存在
int maxCanGetIndex = orgParentIdList.length - 2;
// 如果没有最顶级的上级，则他本身就是最顶级上级
if (maxCanGetIndex < 0) {
return orgId;
}
// 根据参数传参，进行获取上级的操作
String orgIdString;
if (needGetArrayIndex <= (maxCanGetIndex)) {
orgIdString = orgParentIdList[needGetArrayIndex];
} else {
orgIdString = orgParentIdList[maxCanGetIndex];
}
return Long.valueOf(orgIdString);
}
}