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

【7.2.2】组织机构查询带查询条件则不进行构建树

pull/29/head
fengshuonan 2022-05-21 11:18:56 +08:00
parent 020899e465
commit 715d3392b7
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -233,8 +233,12 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
} }
} }
// 构建树并返回 if (ObjectUtil.isNotEmpty(hrOrganizationRequest.getOrgName())
return new DefaultTreeBuildFactory<OrganizationTreeNode>().doTreeBuild(treeNodeList); || ObjectUtil.isNotEmpty(hrOrganizationRequest.getOrgCode())) {
return treeNodeList;
} else {
return new DefaultTreeBuildFactory<OrganizationTreeNode>().doTreeBuild(treeNodeList);
}
} }
@Override @Override
@ -393,7 +397,7 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
queryWrapper.like(ObjectUtil.isNotEmpty(orgName), HrOrganization::getOrgName, orgName); queryWrapper.like(ObjectUtil.isNotEmpty(orgName), HrOrganization::getOrgName, orgName);
// 拼接组织机构编码条件 // 拼接组织机构编码条件
queryWrapper.eq(ObjectUtil.isNotEmpty(orgCode), HrOrganization::getOrgCode, orgCode); queryWrapper.like(ObjectUtil.isNotEmpty(orgCode), HrOrganization::getOrgCode, orgCode);
// 拼接父机构id查询条件 // 拼接父机构id查询条件
if (ObjectUtil.isNotEmpty(orgParentId)) { if (ObjectUtil.isNotEmpty(orgParentId)) {