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

【8.0】【system】修复查询组织机构树接口

pull/57/head
fengshuonan 2023-07-13 22:51:24 +08:00
parent 7a50ae5d84
commit 4c296d54ca
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -189,6 +189,12 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
@Override @Override
public List<HrOrganization> commonOrgTree(CommonOrgTreeRequest commonOrgTreeRequest) { public List<HrOrganization> commonOrgTree(CommonOrgTreeRequest commonOrgTreeRequest) {
// 如果查询带组织机构名称的搜索，则清空其他条件
if (ObjectUtil.isNotEmpty(commonOrgTreeRequest.getSearchText())) {
commonOrgTreeRequest.setOrgParentId(null);
commonOrgTreeRequest.setIndexOrgIdList(null);
}
// 根据条件查询组织机构列表 // 根据条件查询组织机构列表
LambdaQueryWrapper<HrOrganization> wrapper = this.createCommonTreeWrapper(commonOrgTreeRequest); LambdaQueryWrapper<HrOrganization> wrapper = this.createCommonTreeWrapper(commonOrgTreeRequest);
wrapper.select(HrOrganization::getOrgId, HrOrganization::getOrgPids, wrapper.select(HrOrganization::getOrgId, HrOrganization::getOrgPids,