diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java index 97654c9e9..f0a3da329 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/org/service/impl/HrOrganizationServiceImpl.java @@ -189,6 +189,12 @@ public class HrOrganizationServiceImpl extends ServiceImpl commonOrgTree(CommonOrgTreeRequest commonOrgTreeRequest) { + // 如果查询带组织机构名称的搜索,则清空其他条件 + if (ObjectUtil.isNotEmpty(commonOrgTreeRequest.getSearchText())) { + commonOrgTreeRequest.setOrgParentId(null); + commonOrgTreeRequest.setIndexOrgIdList(null); + } + // 根据条件查询组织机构列表 LambdaQueryWrapper wrapper = this.createCommonTreeWrapper(commonOrgTreeRequest); wrapper.select(HrOrganization::getOrgId, HrOrganization::getOrgPids,