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

【7.6.0】【sys】【org】增加接口：分页获取组织机构信息（用在通用选择机构组件中）

pull/57/head
fengshuonan 2023-06-29 09:43:57 +08:00
parent f50bc6c39c
commit 80782d3874
4 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/controller/CommonOrgController.java
View File

@ -1,5 +1,6 @@
package cn.stylefeng.roses.kernel.sys.modular.org.controller;
import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;
import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
@ -38,4 +39,15 @@ public class CommonOrgController {
return new SuccessResponseData<>(hrOrganizationService.commonOrgTree(hrOrganizationRequest));
}
/**
* 分页获取组织机构信息（用在通用选择机构组件中）
*
* @author fengshuonan
* @since 2023/6/29 9:24
*/
@GetResource(name = "分页获取组织机构信息（用在通用选择机构组件中）", path = "/common/org/pageList")
public ResponseData<PageResult<HrOrganization>> commonOrgPage(HrOrganizationRequest hrOrganizationRequest) {
return new SuccessResponseData<>(hrOrganizationService.commonOrgPage(hrOrganizationRequest));
}
}

7
kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/entity/HrOrganization.java
View File

@ -140,6 +140,13 @@ public class HrOrganization extends BaseExpandFieldEntity implements AbstractTre
@ChineseDescription("父级id的名称")
private String parentOrgName;
/**
* 组织机构所属公司的名称
*/
@TableField(exist = false)
@ChineseDescription("组织机构所属公司的名称")
private String companyName;
@Override
public String getNodeId() {
if (this.orgId == null) {

10
kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/HrOrganizationService.java
View File

@ -81,6 +81,16 @@ public interface HrOrganizationService extends IService<HrOrganization> {
*/
PageResult<HrOrganization> findPage(HrOrganizationRequest hrOrganizationRequest);
/**
* 分页获取组织机构信息（用在通用选择机构组件中）
*
* @param hrOrganizationRequest 请求参数
* @return PageResult<HrOrganization> 返回结果
* @author fengshuonan
* @date 2023/06/10 21:23
*/
PageResult<HrOrganization> commonOrgPage(HrOrganizationRequest hrOrganizationRequest);
/**
* 通用获取组织机构树
* <p>

19
kernel-s-sys/sys-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java
View File

@ -166,6 +166,25 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
return PageResultFactory.createPageResult(sysRolePage);
}
@Override
public PageResult<HrOrganization> commonOrgPage(HrOrganizationRequest hrOrganizationRequest) {
LambdaQueryWrapper<HrOrganization> wrapper = createWrapper(hrOrganizationRequest);
// 只查询需要的字段
wrapper.select(HrOrganization::getOrgId, HrOrganization::getOrgName, HrOrganization::getOrgCode, HrOrganization::getOrgType);
Page<HrOrganization> sysRolePage = this.page(PageFactory.defaultPage(), wrapper);
// 将每个机构的公司名称返回
for (HrOrganization hrOrganization : sysRolePage.getRecords()) {
CompanyDeptDTO companyInfo = this.getOrgCompanyInfo(hrOrganization);
hrOrganization.setCompanyName(companyInfo.getCompanyName());
}
return PageResultFactory.createPageResult(sysRolePage);
}
@Override
public List<HrOrganization> commonOrgTree(HrOrganizationRequest hrOrganizationRequest) {